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

Merge branch 'master' into doc-rm

Browse Source
This commit is contained in:
GriffinR
2020-04-06 00:37:08 -04:00
committed by GitHub
parent 5f1a4de374 35a578c620
commit 93d17ef7c8
149 changed files with 4459 additions and 3904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+3 -1
View File
@@ -15,8 +15,10 @@ cache:
apt: true
install:
- pushd $HOME
- travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r50/devkitARM_r50-linux.tar.xz
- travis_retry wget https://github.com/devkitPro/buildscripts/releases/download/devkitARM_r52/devkitARM_r52-linux.tar.xz
- tar xJf devkitARM*.tar.xz
- travis_retry wget https://github.com/devkitPro/devkitarm-rules/releases/download/v1.0.0/devkitarm-rules-1.0.0.tar.xz
- tar xJf devkitarm-rules-*.tar.xz -C $DEVKITARM
- travis_retry git clone https://github.com/pret/agbcc.git
- cd agbcc && sh build.sh && sh install.sh $TRAVIS_BUILD_DIR
- popd
asm/pokemon_summary_screen.s
+6 -6
View File
@@ -490,7 +490,7 @@ _081348D6:
.align 2, 0
_081348E0: .4byte 0x00003270
_081348E4:
bl sub_80BF72C
bl MenuHelpers_CallLinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -786,7 +786,7 @@ _08134B38:
_08134B58: .4byte gUnknown_203B140
_08134B5C: .4byte 0x00003270
_08134B60:
bl sub_8058244
bl Overworld_LinkRecvQueueLengthMoreThan2
cmp r0, 0x1
beq _08134B9A
bl sub_800B270
@@ -8687,7 +8687,7 @@ _08138D0A:
_08138D10:
b _08139094
_08138D12:
bl sub_80BF72C
bl MenuHelpers_CallLinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -9080,7 +9080,7 @@ _08139024:
.align 2, 0
_08139030: .4byte gUnknown_203B16D
_08139034:
bl sub_80BF72C
bl MenuHelpers_CallLinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -9800,7 +9800,7 @@ _08139604:
_08139620: .4byte gUnknown_203B140
_08139624: .4byte 0x00003288
_08139628:
bl sub_80BF72C
bl MenuHelpers_CallLinkSomething
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -13905,7 +13905,7 @@ _0813B700: .4byte 0x00003003
_0813B704: .4byte 0x00003004
_0813B708: .4byte 0x0000328c
_0813B70C:
bl sub_8058244
bl Overworld_LinkRecvQueueLengthMoreThan2
cmp r0, 0
bne _0813B746
bl sub_800B270
common_syms/quest_log.txt
+1 -1
View File
@@ -1,4 +1,4 @@
gUnknown_3005E88
sNumEventsInLogEntry
gUnknown_3005E90
gQuestLogFieldInput
sCurQuestLogEntry
data/battle_anim_scripts.s
+831 -799
View File
File diff suppressed because it is too large Load Diff
data/decoration_tiles.inc
-359
View File
@@ -1,359 +0,0 @@
gUnknown_8454004:: @ 8454004
.2byte 0x087
gUnknown_8454006:: @ 8454006
.2byte 0x08F
gUnknown_8454008:: @ 8454008
.2byte 0x090, 0x091, 0x092, 0x098, 0x099, 0x09A
gUnknown_8454014:: @ 8454014
.2byte 0x093, 0x094, 0x095, 0x09B, 0x09C, 0x09D
gUnknown_8454020:: @ 8454020
.2byte 0x096, 0x097, 0x0A3, 0x09E, 0x09F, 0x0AB
gUnknown_845402C:: @ 845402C
.2byte 0x0BD, 0x0BE, 0x0BF, 0x0C5, 0x0C6, 0x0C7, 0x0CD, 0x0CE, 0x0CF
gUnknown_845403E:: @ 845403E
.2byte 0x0A0, 0x0A1, 0x0A2, 0x0A8, 0x0A9, 0x0AA, 0x0B0, 0x0B1, 0x0B2
gUnknown_8454050:: @ 8454050
.2byte 0x0A4, 0x0A5, 0x0A6, 0x0AC, 0x0AD, 0x0AE, 0x0B4, 0x0B5, 0x0B6
gUnknown_8454062:: @ 8454062
.2byte 0x0A7, 0x0BB, 0x0BC, 0x0AF, 0x0C3, 0x0C4, 0x0B7, 0x0CB, 0x0CC
gUnknown_8454074:: @ 8454074
.2byte 0x0B8
gUnknown_8454076:: @ 8454076
.2byte 0x0B9
gUnknown_8454078:: @ 8454078
.2byte 0x0BA
gUnknown_845407A:: @ 845407A
.2byte 0x0C0
gUnknown_845407C:: @ 845407C
.2byte 0x0C1
gUnknown_845407E:: @ 845407E
.2byte 0x0C2
gUnknown_8454080:: @ 8454080
.2byte 0x0C8
gUnknown_8454082:: @ 8454082
.2byte 0x0C9
gUnknown_8454084:: @ 8454084
.2byte 0x0CA
gUnknown_8454086:: @ 8454086
.2byte 0x0D0, 0x0D8
gUnknown_845408A:: @ 845408A
.2byte 0x0D2, 0x0DA
gUnknown_845408E:: @ 845408E
.2byte 0x0D4, 0x0DC
gUnknown_8454092:: @ 8454092
.2byte 0x0E0, 0x0E2, 0x0E8, 0x0E9
gUnknown_845409A:: @ 845409A
.2byte 0x0E4, 0x0E6, 0x0EC, 0x0ED
gUnknown_84540A2:: @ 84540A2
.2byte 0x0F0, 0x0F2, 0x0F8, 0x0F9
gUnknown_84540AA:: @ 84540AA
.2byte 0x025, 0x02D
gUnknown_84540AE:: @ 84540AE
.2byte 0x026, 0x02E
gUnknown_84540B2:: @ 84540B2
.2byte 0x027, 0x02F
gUnknown_84540B6:: @ 84540B6
.2byte 0x138
gUnknown_84540B8:: @ 84540B8
.2byte 0x13C
gUnknown_84540BA:: @ 84540BA
.2byte 0x140
gUnknown_84540BC:: @ 84540BC
.2byte 0x030, 0x031, 0x032, 0x038, 0x039, 0x03A, 0x040, 0x041, 0x03B
gUnknown_84540CE:: @ 84540CE
.2byte 0x048, 0x049, 0x068, 0x050, 0x051, 0x070, 0x058, 0x059, 0x069
gUnknown_84540E0:: @ 84540E0
.2byte 0x034, 0x03C
gUnknown_84540E4:: @ 84540E4
.2byte 0x035, 0x036, 0x03D, 0x03E, 0x063, 0x064, 0x06F, 0x077
gUnknown_84540F4:: @ 84540F4
.2byte 0x033
gUnknown_84540F6:: @ 84540F6
.2byte 0x02C
gUnknown_84540F8:: @ 84540F8
.2byte 0x080, 0x081, 0x088, 0x089
gUnknown_8454100:: @ 8454100
.2byte 0x06A, 0x06B, 0x06C, 0x06D, 0x072, 0x073, 0x074, 0x075
gUnknown_8454110:: @ 8454110
.2byte 0x028
gUnknown_8454112:: @ 8454112
.2byte 0x037, 0x03F
gUnknown_8454116:: @ 8454116
.2byte 0x085, 0x08D
gUnknown_845411A:: @ 845411A
.2byte 0x0D6, 0x0DE
gUnknown_845411E:: @ 845411E
.2byte 0x12E, 0x136
gUnknown_8454122:: @ 8454122
.2byte 0x082, 0x08A
gUnknown_8454126:: @ 8454126
.2byte 0x0F4
gUnknown_8454128:: @ 8454128
.2byte 0x0F5
gUnknown_845412A:: @ 845412A
.2byte 0x0F6
gUnknown_845412C:: @ 845412C
.2byte 0x060
gUnknown_845412E:: @ 845412E
.2byte 0x061
gUnknown_8454130:: @ 8454130
.2byte 0x062
gUnknown_8454132:: @ 8454132
.2byte 0x078
gUnknown_8454134:: @ 8454134
.2byte 0x079
gUnknown_8454136:: @ 8454136
.2byte 0x07A
gUnknown_8454138:: @ 8454138
.2byte 0x07B
gUnknown_845413A:: @ 845413A
.2byte 0x07C
gUnknown_845413C:: @ 845413C
.2byte 0x07D
gUnknown_845413E:: @ 845413E
.2byte 0x07E
gUnknown_8454140:: @ 8454140
.2byte 0x0B3
gUnknown_8454142:: @ 8454142
.2byte 0x042, 0x043, 0x044, 0x04A, 0x04B, 0x04C, 0x052, 0x053, 0x054
gUnknown_8454154:: @ 8454154
.2byte 0x045, 0x046, 0x047, 0x04D, 0x04E, 0x04F, 0x055, 0x056, 0x057
gUnknown_8454166:: @ 8454166
.2byte 0x05A, 0x05B, 0x05C, 0x05D, 0x05E, 0x05F, 0x065, 0x066, 0x067
gUnknown_8454178:: @ 8454178
.2byte 0x100, 0x101, 0x102, 0x108, 0x109, 0x10A, 0x110, 0x111, 0x112
gUnknown_845418A:: @ 845418A
.2byte 0x103, 0x104, 0x105, 0x10B, 0x10C, 0x10D, 0x113, 0x114, 0x115
gUnknown_845419C:: @ 845419C
.2byte 0x106, 0x107, 0x118, 0x10E, 0x10F, 0x120, 0x116, 0x117, 0x128
gUnknown_84541AE:: @ 84541AE
.2byte 0x119, 0x11A, 0x11B, 0x121, 0x122, 0x123, 0x129, 0x12A, 0x12B
gUnknown_84541C0:: @ 84541C0
.2byte 0x130
gUnknown_84541C2:: @ 84541C2
.2byte 0x131
gUnknown_84541C4:: @ 84541C4
.2byte 0x132
gUnknown_84541C6:: @ 84541C6
.2byte 0x133
gUnknown_84541C8:: @ 84541C8
.2byte 0x134
gUnknown_84541CA:: @ 84541CA
.2byte 0x11C, 0x11D
gUnknown_84541CE:: @ 84541CE
.2byte 0x11E, 0x11F
gUnknown_84541D2:: @ 84541D2
.2byte 0x124, 0x125
gUnknown_84541D6:: @ 84541D6
.2byte 0x126, 0x127
gUnknown_84541DA:: @ 84541DA
.2byte 0x12C, 0x12D
gUnknown_84541DE:: @ 84541DE
.2byte 0x05C
gUnknown_84541E0:: @ 84541E0
.2byte 0x05C
gUnknown_84541E2:: @ 84541E2
.2byte 0x05C
gUnknown_84541E4:: @ 84541E4
.2byte 0x05C
gUnknown_84541E6:: @ 84541E6
.2byte 0x05C
gUnknown_84541E8:: @ 84541E8
.2byte 0x05C
gUnknown_84541EA:: @ 84541EA
.2byte 0x05C
gUnknown_84541EC:: @ 84541EC
.2byte 0x05C
gUnknown_84541EE:: @ 84541EE
.2byte 0x05C
gUnknown_84541F0:: @ 84541F0
.2byte 0x05C
gUnknown_84541F2:: @ 84541F2
.2byte 0x05C
gUnknown_84541F4:: @ 84541F4
.2byte 0x05C
gUnknown_84541F6:: @ 84541F6
.2byte 0x05C
gUnknown_84541F8:: @ 84541F8
.2byte 0x05C
gUnknown_84541FA:: @ 84541FA
.2byte 0x05C
gUnknown_84541FC:: @ 84541FC
.2byte 0x05C
gUnknown_84541FE:: @ 84541FE
.2byte 0x05C
gUnknown_8454200:: @ 8454200
.2byte 0x05C
gUnknown_8454202:: @ 8454202
.2byte 0x05C
gUnknown_8454204:: @ 8454204
.2byte 0x05C
gUnknown_8454206:: @ 8454206
.2byte 0x05C
gUnknown_8454208:: @ 8454208
.2byte 0x05C
gUnknown_845420A:: @ 845420A
.2byte 0x05C
gUnknown_845420C:: @ 845420C
.2byte 0x05C
gUnknown_845420E:: @ 845420E
.2byte 0x05C
gUnknown_8454210:: @ 8454210
.2byte 0x05C
gUnknown_8454212:: @ 8454212
.2byte 0x05C
gUnknown_8454214:: @ 8454214
.2byte 0x05C
gUnknown_8454216:: @ 8454216
.2byte 0x05C
gUnknown_8454218:: @ 8454218
.2byte 0x05C
gUnknown_845421A:: @ 845421A
.2byte 0x05C
gUnknown_845421C:: @ 845421C
.2byte 0x05C
gUnknown_845421E:: @ 845421E
.2byte 0x05C
gUnknown_8454220:: @ 8454220
.2byte 0x05C
gUnknown_8454222:: @ 8454222
.2byte 0x05C
gUnknown_8454224:: @ 8454224
.2byte 0x05C
gUnknown_8454226:: @ 8454226
.2byte 0x05C
gUnknown_8454228:: @ 8454228
.2byte 0x05C
gUnknown_845422A:: @ 845422A
.2byte 0x05C
gUnknown_845422C:: @ 845422C
.2byte 0x05C
gUnknown_845422E:: @ 845422E
.2byte 0x05C
gUnknown_8454230:: @ 8454230
.2byte 0x05C
gUnknown_8454232:: @ 8454232
.2byte 0x05C
gUnknown_8454234:: @ 8454234
.2byte 0x05C
gUnknown_8454236:: @ 8454236
.2byte 0x05C
data/decorations.s
-857
View File
@@ -1,857 +0,0 @@
#include "constants/decorations.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
.include "data/decoration_tiles.inc"
.include "data/text/decoration_descriptions.inc"
.align 2
gDecorations:: @ 84556F8
.byte DECOR_NONE
.string "SMALL DESK$", 16
.byte 0x00, 0x00, 0x00
.2byte 0, 0
.4byte gUnknown_8454238
.4byte gUnknown_8454004
.byte DECOR_SMALL_DESK
.string "SMALL DESK$", 16
.byte 0x00, 0x00, 0x00
.2byte 3000, 0
.4byte gUnknown_8454238
.4byte gUnknown_8454004
.byte DECOR_POKEMON_DESK
.string "POKéMON DESK$", 16
.byte 0x00, 0x00, 0x00
.2byte 3000, 0
.4byte gUnknown_8454254
.4byte gUnknown_8454006
.byte DECOR_HEAVY_DESK
.string "HEAVY DESK$", 16
.byte 0x00, 0x09, 0x00
.2byte 6000, 0
.4byte gUnknown_8454284
.4byte gUnknown_8454008
.byte DECOR_RAGGED_DESK
.string "RAGGED DESK$", 16
.byte 0x00, 0x09, 0x00
.2byte 6000, 0
.4byte gUnknown_84542BC
.4byte gUnknown_8454014
.byte DECOR_COMFORT_DESK
.string "COMFORT DESK$", 16
.byte 0x00, 0x09, 0x00
.2byte 6000, 0
.4byte gUnknown_84542F3
.4byte gUnknown_8454020
.byte DECOR_PRETTY_DESK
.string "PRETTY DESK$", 16
.byte 0x00, 0x08, 0x00
.2byte 9000, 0
.4byte gUnknown_845432C
.4byte gUnknown_845402C
.byte DECOR_BRICK_DESK
.string "BRICK DESK$", 16
.byte 0x00, 0x08, 0x00
.2byte 9000, 0
.4byte gUnknown_8454362
.4byte gUnknown_845403E
.byte DECOR_CAMP_DESK
.string "CAMP DESK$", 16
.byte 0x00, 0x08, 0x00
.2byte 9000, 0
.4byte gUnknown_8454398
.4byte gUnknown_8454050
.byte DECOR_HARD_DESK
.string "HARD DESK$", 16
.byte 0x00, 0x08, 0x00
.2byte 9000, 0
.4byte gUnknown_84543D1
.4byte gUnknown_8454062
.byte DECOR_SMALL_CHAIR
.string "SMALL CHAIR$", 16
.byte 0x01, 0x00, 0x01
.2byte 2000, 0
.4byte gUnknown_8454404
.4byte gUnknown_8454074
.byte DECOR_POKEMON_CHAIR
.string "POKéMON CHAIR$", 16
.byte 0x01, 0x00, 0x01
.2byte 2000, 0
.4byte gUnknown_8454420
.4byte gUnknown_8454076
.byte DECOR_HEAVY_CHAIR
.string "HEAVY CHAIR$", 16
.byte 0x01, 0x00, 0x01
.2byte 2000, 0
.4byte gUnknown_8454451
.4byte gUnknown_8454078
.byte DECOR_PRETTY_CHAIR
.string "PRETTY CHAIR$", 16
.byte 0x01, 0x00, 0x01
.2byte 2000, 0
.4byte gUnknown_845446E
.4byte gUnknown_845407A
.byte DECOR_COMFORT_CHAIR
.string "COMFORT CHAIR$", 16
.byte 0x01, 0x00, 0x01
.2byte 2000, 0
.4byte gUnknown_845448B
.4byte gUnknown_845407C
.byte DECOR_RAGGED_CHAIR
.string "RAGGED CHAIR$", 16
.byte 0x01, 0x00, 0x01
.2byte 2000, 0
.4byte gUnknown_84544A9
.4byte gUnknown_845407E
.byte DECOR_BRICK_CHAIR
.string "BRICK CHAIR$", 16
.byte 0x01, 0x00, 0x01
.2byte 2000, 0
.4byte gUnknown_84544C5
.4byte gUnknown_8454080
.byte DECOR_CAMP_CHAIR
.string "CAMP CHAIR$", 16
.byte 0x01, 0x00, 0x01
.2byte 2000, 0
.4byte gUnknown_84544E2
.4byte gUnknown_8454082
.byte DECOR_HARD_CHAIR
.string "HARD CHAIR$", 16
.byte 0x01, 0x00, 0x01
.2byte 2000, 0
.4byte gUnknown_84544FE
.4byte gUnknown_8454084
.byte DECOR_RED_PLANT
.string "RED PLANT$", 16
.byte 0x02, 0x05, 0x02
.2byte 3000, 0
.4byte gUnknown_845451A
.4byte gUnknown_8454086
.byte DECOR_TROPICAL_PLANT
.string "TROPICAL PLANT$", 16
.byte 0x02, 0x05, 0x02
.2byte 3000, 0
.4byte gUnknown_8454534
.4byte gUnknown_845408A
.byte DECOR_PRETTY_FLOWERS
.string "PRETTY FLOWERS$", 16
.byte 0x02, 0x05, 0x02
.2byte 3000, 0
.4byte gUnknown_8454559
.4byte gUnknown_845408E
.byte DECOR_COLORFUL_PLANT
.string "COLORFUL PLANT$", 16
.byte 0x02, 0x04, 0x02
.2byte 5000, 0
.4byte gUnknown_8454570
.4byte gUnknown_8454092
.byte DECOR_BIG_PLANT
.string "BIG PLANT$", 16
.byte 0x02, 0x04, 0x02
.2byte 5000, 0
.4byte gUnknown_8454598
.4byte gUnknown_845409A
.byte DECOR_GORGEOUS_PLANT
.string "GORGEOUS PLANT$", 16
.byte 0x02, 0x04, 0x02
.2byte 5000, 0
.4byte gUnknown_84545C6
.4byte gUnknown_84540A2
.byte DECOR_RED_BRICK
.string "RED BRICK$", 16
.byte 0x00, 0x05, 0x03
.2byte 500, 0
.4byte gUnknown_84545EE
.4byte gUnknown_84540AA
.byte DECOR_YELLOW_BRICK
.string "YELLOW BRICK$", 16
.byte 0x00, 0x05, 0x03
.2byte 500, 0
.4byte gUnknown_8454625
.4byte gUnknown_84540AE
.byte DECOR_BLUE_BRICK
.string "BLUE BRICK$", 16
.byte 0x00, 0x05, 0x03
.2byte 500, 0
.4byte gUnknown_845465A
.4byte gUnknown_84540B2
.byte DECOR_RED_BALLOON
.string "RED BALLOON$", 16
.byte 0x01, 0x00, 0x03
.2byte 500, 0
.4byte gUnknown_845468D
.4byte gUnknown_84540B6
.byte DECOR_BLUE_BALLOON
.string "BLUE BALLOON$", 16
.byte 0x01, 0x00, 0x03
.2byte 500, 0
.4byte gUnknown_84546C4
.4byte gUnknown_84540B8
.byte DECOR_YELLOW_BALLOON
.string "YELLOW BALLOON$", 16
.byte 0x01, 0x00, 0x03
.2byte 500, 0
.4byte gUnknown_84546FC
.4byte gUnknown_84540BA
.byte DECOR_RED_TENT
.string "RED TENT$", 16
.byte 0x01, 0x08, 0x03
.2byte 10000, 0
.4byte gUnknown_8454734
.4byte gUnknown_84540BC
.byte DECOR_BLUE_TENT
.string "BLUE TENT$", 16
.byte 0x01, 0x08, 0x03
.2byte 10000, 0
.4byte gUnknown_845475E
.4byte gUnknown_84540CE
.byte DECOR_SOLID_BOARD
.string "SOLID BOARD$", 16
.byte 0x01, 0x05, 0x03
.2byte 3000, 0
.4byte gUnknown_8454789
.4byte gUnknown_84540E0
.byte DECOR_SLIDE
.string "SLIDE$", 16
.byte 0x01, 0x07, 0x03
.2byte 8000, 0
.4byte gUnknown_84547B7
.4byte gUnknown_84540E4
.byte DECOR_FENCE_LENGTH
.string "FENCE LENGTH$", 16
.byte 0x00, 0x00, 0x03
.2byte 500, 0
.4byte gUnknown_84547DC
.4byte gUnknown_84540F4
.byte DECOR_FENCE_WIDTH
.string "FENCE WIDTH$", 16
.byte 0x00, 0x00, 0x03
.2byte 500, 0
.4byte gUnknown_84547FF
.4byte gUnknown_84540F6
.byte DECOR_TIRE
.string "TIRE$", 16
.byte 0x00, 0x04, 0x03
.2byte 800, 0
.4byte gUnknown_8454822
.4byte gUnknown_84540F8
.byte DECOR_STAND
.string "STAND$", 16
.byte 0x01, 0x03, 0x03
.2byte 7000, 0
.4byte gUnknown_8454857
.4byte gUnknown_8454100
.byte DECOR_MUD_BALL
.string "MUD BALL$", 16
.byte 0x01, 0x00, 0x03
.2byte 200, 0
.4byte gUnknown_8454874
.4byte gUnknown_8454110
.byte DECOR_BREAKABLE_DOOR
.string "BREAKABLE DOOR$", 16
.byte 0x01, 0x05, 0x03
.2byte 3000, 0
.4byte gUnknown_84548A1
.4byte gUnknown_8454112
.byte DECOR_SAND_ORNAMENT
.string "SAND ORNAMENT$", 16
.byte 0x02, 0x05, 0x03
.2byte 3000, 0
.4byte gUnknown_84548D2
.4byte gUnknown_8454116
.byte DECOR_SILVER_SHIELD
.string "SILVER SHIELD$", 16
.byte 0x02, 0x05, 0x03
.2byte 0, 0
.4byte gUnknown_8454901
.4byte gUnknown_845411A
.byte DECOR_GOLD_SHIELD
.string "GOLD SHIELD$", 16
.byte 0x02, 0x05, 0x03
.2byte 0, 0
.4byte gUnknown_8454933
.4byte gUnknown_845411E
.byte DECOR_GLASS_ORNAMENT
.string "GLASS ORNAMENT$", 16
.byte 0x02, 0x05, 0x03
.2byte 0, 0
.4byte gUnknown_8454966
.4byte gUnknown_8454122
.byte DECOR_TV
.string "TV$", 16
.byte 0x00, 0x00, 0x03
.2byte 3000, 0
.4byte gUnknown_845499F
.4byte gUnknown_8454126
.byte DECOR_ROUND_TV
.string "ROUND TV$", 16
.byte 0x00, 0x00, 0x03
.2byte 4000, 0
.4byte gUnknown_84549BE
.4byte gUnknown_8454128
.byte DECOR_CUTE_TV
.string "CUTE TV$", 16
.byte 0x00, 0x00, 0x03
.2byte 4000, 0
.4byte gUnknown_84549E9
.4byte gUnknown_845412A
.byte DECOR_GLITTER_MAT
.string "GLITTER MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 2000, 0
.4byte gUnknown_8454A14
.4byte gUnknown_845412C
.byte DECOR_JUMP_MAT
.string "JUMP MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 2000, 0
.4byte gUnknown_8454A3C
.4byte gUnknown_845412E
.byte DECOR_SPIN_MAT
.string "SPIN MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 2000, 0
.4byte gUnknown_8454A6A
.4byte gUnknown_8454130
.byte DECOR_C_LOW_NOTE_MAT
.string "C Low NOTE MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 500, 0
.4byte gUnknown_8454A99
.4byte gUnknown_8454132
.byte DECOR_D_NOTE_MAT
.string "D NOTE MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 500, 0
.4byte gUnknown_8454AC8
.4byte gUnknown_8454134
.byte DECOR_E_NOTE_MAT
.string "E NOTE MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 500, 0
.4byte gUnknown_8454AF3
.4byte gUnknown_8454136
.byte DECOR_F_NOTE_MAT
.string "F NOTE MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 500, 0
.4byte gUnknown_8454B1F
.4byte gUnknown_8454138
.byte DECOR_G_NOTE_MAT
.string "G NOTE MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 500, 0
.4byte gUnknown_8454B4B
.4byte gUnknown_845413A
.byte DECOR_A_NOTE_MAT
.string "A NOTE MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 500, 0
.4byte gUnknown_8454B76
.4byte gUnknown_845413C
.byte DECOR_B_NOTE_MAT
.string "B NOTE MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 500, 0
.4byte gUnknown_8454BA2
.4byte gUnknown_845413E
.byte DECOR_C_HIGH_NOTE_MAT
.string "C High NOTE MAT$", 16
.byte 0x01, 0x00, 0x04
.2byte 500, 0
.4byte gUnknown_8454BCD
.4byte gUnknown_8454140
.byte DECOR_SURF_MAT
.string "SURF MAT$", 16
.byte 0x01, 0x08, 0x04
.2byte 4000, 0
.4byte gUnknown_8454BFD
.4byte gUnknown_8454142
.byte DECOR_THUNDER_MAT
.string "THUNDER MAT$", 16
.byte 0x01, 0x08, 0x04
.2byte 4000, 0
.4byte gUnknown_8454C31
.4byte gUnknown_8454154
.byte DECOR_FIRE_BLAST_MAT
.string "FIRE BLAST MAT$", 16
.byte 0x01, 0x08, 0x04
.2byte 4000, 0
.4byte gUnknown_8454C68
.4byte gUnknown_8454166
.byte DECOR_POWDER_SNOW_MAT
.string "POWDER SNOW MAT$", 16
.byte 0x01, 0x08, 0x04
.2byte 4000, 0
.4byte gUnknown_8454CA2
.4byte gUnknown_8454178
.byte DECOR_ATTRACT_MAT
.string "ATTRACT MAT$", 16
.byte 0x01, 0x08, 0x04
.2byte 4000, 0
.4byte gUnknown_8454CDB
.4byte gUnknown_845418A
.byte DECOR_FISSURE_MAT
.string "FISSURE MAT$", 16
.byte 0x01, 0x08, 0x04
.2byte 4000, 0
.4byte gUnknown_8454D13
.4byte gUnknown_845419C
.byte DECOR_SPIKES_MAT
.string "SPIKES MAT$", 16
.byte 0x01, 0x08, 0x04
.2byte 4000, 0
.4byte gUnknown_8454D4A
.4byte gUnknown_84541AE
.byte DECOR_BALL_POSTER
.string "BALL POSTER$", 16
.byte 0x03, 0x00, 0x05
.2byte 1000, 0
.4byte gUnknown_8454D80
.4byte gUnknown_84541C0
.byte DECOR_GREEN_POSTER
.string "GREEN POSTER$", 16
.byte 0x03, 0x00, 0x05
.2byte 1000, 0
.4byte gUnknown_8454DA8
.4byte gUnknown_84541C2
.byte DECOR_RED_POSTER
.string "RED POSTER$", 16
.byte 0x03, 0x00, 0x05
.2byte 1000, 0
.4byte gUnknown_8454DCD
.4byte gUnknown_84541C4
.byte DECOR_BLUE_POSTER
.string "BLUE POSTER$", 16
.byte 0x03, 0x00, 0x05
.2byte 1000, 0
.4byte gUnknown_8454DF2
.4byte gUnknown_84541C6
.byte DECOR_CUTE_POSTER
.string "CUTE POSTER$", 16
.byte 0x03, 0x00, 0x05
.2byte 1000, 0
.4byte gUnknown_8454E16
.4byte gUnknown_84541C8
.byte DECOR_PIKA_POSTER
.string "PIKA POSTER$", 16
.byte 0x03, 0x01, 0x05
.2byte 1500, 0
.4byte gUnknown_8454E3C
.4byte gUnknown_84541CA
.byte DECOR_LONG_POSTER
.string "LONG POSTER$", 16
.byte 0x03, 0x01, 0x05
.2byte 1500, 0
.4byte gUnknown_8454E6B
.4byte gUnknown_84541CE
.byte DECOR_SEA_POSTER
.string "SEA POSTER$", 16
.byte 0x03, 0x01, 0x05
.2byte 1500, 0
.4byte gUnknown_8454E90
.4byte gUnknown_84541D2
.byte DECOR_SKY_POSTER
.string "SKY POSTER$", 16
.byte 0x03, 0x01, 0x05
.2byte 1500, 0
.4byte gUnknown_8454EB7
.4byte gUnknown_84541D6
.byte DECOR_KISS_POSTER
.string "KISS POSTER$", 16
.byte 0x03, 0x01, 0x05
.2byte 1500, 0
.4byte gUnknown_8454EDC
.4byte gUnknown_84541DA
.byte DECOR_PICHU_DOLL
.string "PICHU DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8454F02
.4byte gUnknown_84541DE
.byte DECOR_PIKACHU_DOLL
.string "PIKACHU DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8454F2D
.4byte gUnknown_84541E0
.byte DECOR_MARILL_DOLL
.string "MARILL DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8454F5A
.4byte gUnknown_84541E2
.byte DECOR_TOGEPI_DOLL
.string "TOGEPI DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8454F86
.4byte gUnknown_84541E4
.byte DECOR_CYNDAQUIL_DOLL
.string "CYNDAQUIL DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8454FB2
.4byte gUnknown_84541E6
.byte DECOR_CHIKORITA_DOLL
.string "CHIKORITA DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8454FE1
.4byte gUnknown_84541E8
.byte DECOR_TOTODILE_DOLL
.string "TOTODILE DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8455010
.4byte gUnknown_84541EA
.byte DECOR_JIGGLYPUFF_DOLL
.string "JIGGLYPUFF DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_845503E
.4byte gUnknown_84541EC
.byte DECOR_MEOWTH_DOLL
.string "MEOWTH DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_845506E
.4byte gUnknown_84541EE
.byte DECOR_CLEFAIRY_DOLL
.string "CLEFAIRY DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_845509A
.4byte gUnknown_84541F0
.byte DECOR_DITTO_DOLL
.string "DITTO DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_84550C8
.4byte gUnknown_84541F2
.byte DECOR_SMOOCHUM_DOLL
.string "SMOOCHUM DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_84550F3
.4byte gUnknown_84541F4
.byte DECOR_TREECKO_DOLL
.string "TREECKO DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8455121
.4byte gUnknown_84541F6
.byte DECOR_TORCHIC_DOLL
.string "TORCHIC DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_845514E
.4byte gUnknown_84541F8
.byte DECOR_MUDKIP_DOLL
.string "MUDKIP DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_845517B
.4byte gUnknown_84541FA
.byte DECOR_DUSKULL_DOLL
.string "DUSKULL DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_84551A7
.4byte gUnknown_84541FC
.byte DECOR_WYNAUT_DOLL
.string "WYNAUT DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_84551D4
.4byte gUnknown_84541FE
.byte DECOR_BALTOY_DOLL
.string "BALTOY DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8455200
.4byte gUnknown_8454200
.byte DECOR_KECLEON_DOLL
.string "KECLEON DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_845522C
.4byte gUnknown_8454202
.byte DECOR_AZURILL_DOLL
.string "AZURILL DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8455259
.4byte gUnknown_8454204
.byte DECOR_SKITTY_DOLL
.string "SKITTY DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8455287
.4byte gUnknown_8454206
.byte DECOR_SWABLU_DOLL
.string "SWABLU DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_84552B3
.4byte gUnknown_8454208
.byte DECOR_GULPIN_DOLL
.string "GULPIN DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_84552DF
.4byte gUnknown_845420A
.byte DECOR_LOTAD_DOLL
.string "LOTAD DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_845530B
.4byte gUnknown_845420C
.byte DECOR_SEEDOT_DOLL
.string "SEEDOT DOLL$", 16
.byte 0x04, 0x00, 0x06
.2byte 3000, 0
.4byte gUnknown_8455336
.4byte gUnknown_845420E
.byte DECOR_PIKA_CUSHION
.string "PIKA CUSHION$", 16
.byte 0x04, 0x00, 0x07
.2byte 2000, 0
.4byte gUnknown_8455362
.4byte gUnknown_8454210
.byte DECOR_ROUND_CUSHION
.string "ROUND CUSHION$", 16
.byte 0x04, 0x00, 0x07
.2byte 2000, 0
.4byte gUnknown_8455392
.4byte gUnknown_8454212
.byte DECOR_KISS_CUSHION
.string "KISS CUSHION$", 16
.byte 0x04, 0x00, 0x07
.2byte 2000, 0
.4byte gUnknown_84553C1
.4byte gUnknown_8454214
.byte DECOR_ZIGZAG_CUSHION
.string "ZIGZAG CUSHION$", 16
.byte 0x04, 0x00, 0x07
.2byte 2000, 0
.4byte gUnknown_84553F2
.4byte gUnknown_8454216
.byte DECOR_SPIN_CUSHION
.string "SPIN CUSHION$", 16
.byte 0x04, 0x00, 0x07
.2byte 2000, 0
.4byte gUnknown_8455424
.4byte gUnknown_8454218
.byte DECOR_DIAMOND_CUSHION
.string "DIAMOND CUSHION$", 16
.byte 0x04, 0x00, 0x07
.2byte 2000, 0
.4byte gUnknown_8455453
.4byte gUnknown_845421A
.byte DECOR_BALL_CUSHION
.string "BALL CUSHION$", 16
.byte 0x04, 0x00, 0x07
.2byte 2000, 0
.4byte gUnknown_8455483
.4byte gUnknown_845421C
.byte DECOR_GRASS_CUSHION
.string "GRASS CUSHION$", 16
.byte 0x04, 0x00, 0x07
.2byte 2000, 0
.4byte gUnknown_84554B0
.4byte gUnknown_845421E
.byte DECOR_FIRE_CUSHION
.string "FIRE CUSHION$", 16
.byte 0x04, 0x00, 0x07
.2byte 2000, 0
.4byte gUnknown_84554E3
.4byte gUnknown_8454220
.byte DECOR_WATER_CUSHION
.string "WATER CUSHION$", 16
.byte 0x04, 0x00, 0x07
.2byte 2000, 0
.4byte gUnknown_8455515
.4byte gUnknown_8454222
.byte DECOR_SNORLAX_DOLL
.string "SNORLAX DOLL$", 16
.byte 0x04, 0x05, 0x06
.2byte 10000, 0
.4byte gUnknown_8455548
.4byte gUnknown_8454224
.byte DECOR_RHYDON_DOLL
.string "RHYDON DOLL$", 16
.byte 0x04, 0x05, 0x06
.2byte 10000, 0
.4byte gUnknown_8455573
.4byte gUnknown_8454226
.byte DECOR_LAPRAS_DOLL
.string "LAPRAS DOLL$", 16
.byte 0x04, 0x05, 0x06
.2byte 10000, 0
.4byte gUnknown_845559E
.4byte gUnknown_8454228
.byte DECOR_VENUSAUR_DOLL
.string "VENUSAUR DOLL$", 16
.byte 0x04, 0x05, 0x06
.2byte 10000, 0
.4byte gUnknown_84555C9
.4byte gUnknown_845422A
.byte DECOR_CHARIZARD_DOLL
.string "CHARIZARD DOLL$", 16
.byte 0x04, 0x05, 0x06
.2byte 10000, 0
.4byte gUnknown_84555F4
.4byte gUnknown_845422C
.byte DECOR_BLASTOISE_DOLL
.string "BLASTOISE DOLL$", 16
.byte 0x04, 0x05, 0x06
.2byte 10000, 0
.4byte gUnknown_845561F
.4byte gUnknown_845422E
.byte DECOR_WAILMER_DOLL
.string "WAILMER DOLL$", 16
.byte 0x04, 0x05, 0x06
.2byte 10000, 0
.4byte gUnknown_845564A
.4byte gUnknown_8454230
.byte DECOR_REGIROCK_DOLL
.string "REGIROCK DOLL$", 16
.byte 0x04, 0x05, 0x06
.2byte 10000, 0
.4byte gUnknown_8455675
.4byte gUnknown_8454232
.byte DECOR_REGICE_DOLL
.string "REGICE DOLL$", 16
.byte 0x04, 0x05, 0x06
.2byte 10000, 0
.4byte gUnknown_84556A0
.4byte gUnknown_8454234
.byte DECOR_REGISTEEL_DOLL
.string "REGISTEEL DOLL$", 16
.byte 0x04, 0x05, 0x06
.2byte 10000, 0
.4byte gUnknown_84556CB
.4byte gUnknown_8454236
data/event_scripts.s
+3 -3
View File
@@ -1223,10 +1223,10 @@ EventScript_DoInGameTrade:: @ 81A8CD9
faceplayer
return
gUnknown_81A8CED:: @ 81A8CED
special sub_810C3A4
EventScript_VsSeekerChargingDone:: @ 81A8CED
special VsSeekerFreezeObjectsAfterChargeComplete
waitstate
special sub_810C444
special VsSeekerResetObjectMovementAfterChargeComplete
releaseall
end
data/maps/BirthIsland_Exterior/scripts.inc
+1 -1
View File
@@ -43,7 +43,7 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271
lock
faceplayer
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
special DoDeoxysTriangleInteraction
waitstate
switch VAR_RESULT
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -24,7 +24,7 @@ CeruleanCave_B1F_EventScript_ShowMewtwo:: @ 81624F1
CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
waitse
data/maps/CeruleanCity_House4/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
specialvar VAR_0x8004, GetMENewsJisanItemAndState
copyvar VAR_0x8008, VAR_RESULT
data/maps/FiveIsland_MemorialPillar/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ FiveIsland_MemorialPillar_EventScript_ReturnedForTM42:: @ 8168A22
FiveIsland_MemorialPillar_EventScript_Memorial:: @ 8168A48
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lockall
goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced
goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD
FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
goto_if_set SHOWN_REQUESTED_MON, FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest
data/maps/FiveIsland_WaterLabyrinth/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D
FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
goto_if_set FLAG_GOT_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_PostEggComment
data/maps/FourIsland/scripts.inc
+1 -1
View File
@@ -73,7 +73,7 @@ FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52
FourIsland_EventScript_DaycareMan:: @ 8167D55
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
special GetDaycareMonNicknames
data/maps/MtEmber_Summit/scripts.inc
+1 -1
View File
@@ -24,7 +24,7 @@ MtEmber_Summit_EventScript_ShowMoltres:: @ 8163B2F
MtEmber_Summit_EventScript_Moltres:: @ 8163B33
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE
data/maps/MtMoon_B2F/scripts.inc
+2 -2
View File
@@ -63,7 +63,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B
removeobject LOCALID_DOME_FOSSIL
giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5
closemessage
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
delay 10
applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil
waitmovement 0
@@ -95,7 +95,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F
removeobject LOCALID_HELIX_FOSSIL
giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
closemessage
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
delay 10
applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil
waitmovement 0
data/maps/NavelRock_Base/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120
NavelRock_Base_EventScript_Lugia:: @ 8165134
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
waitse
data/maps/NavelRock_Summit/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7
NavelRock_Summit_EventScript_HoOh:: @ 8164FFB
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lockall
setvar VAR_TEMP_1, 1
special SpawnCameraObject
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -289,7 +289,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5
applymovement LOCALID_CELIO, Movement_FacePlayer
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou
special sub_810B82C
special SetPostgameFlags
setflag FLAG_SYS_CAN_LINK_WITH_RS
setflag FLAG_HIDE_CERULEAN_CAVE_GUARD
setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE
data/maps/PalletTown/scripts.inc
+1 -1
View File
@@ -451,7 +451,7 @@ PalletTown_EventScript_SignLadyShowSign:: @ 8165894
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
setvar SIGN_LADY_READY, FALSE
special SetWalkingIntoSignVars
special sub_80699BC
special DisableMsgBoxWalkaway
signmsg
msgbox PalletTown_Text_PressStartToOpenMenuCopy
normalmsg
data/maps/PalletTown_GarysHouse/scripts.inc
+1 -1
View File
@@ -50,7 +50,7 @@ PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF
PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship
msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+2 -2
View File
@@ -723,7 +723,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E
waitfanfare
call EventScript_RestorePrevTextColor
setflag FLAG_SYS_POKEDEX_GET
special sub_810B810
special SetUnlockedPokedexFlags
setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1
msgbox PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese
giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5
@@ -1000,7 +1000,7 @@ PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9
PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls
checkitem ITEM_POKE_BALL, 1
data/maps/PewterCity/scripts.inc
+1 -1
View File
@@ -724,7 +724,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE
waitmessage
waitfanfare
msgbox PewterCity_Text_SwitchedShoesWithRunningShoes
special sub_80699BC
special DisableMsgBoxWalkaway
signmsg
msgbox PewterCity_Text_ExplainRunningShoes
normalmsg
data/maps/PokemonTower_6F/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special StartMarowakBattle
waitstate
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle
goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost
applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp
data/maps/PowerPlant/scripts.inc
+3 -3
View File
@@ -35,7 +35,7 @@ PowerPlant_EventScript_ShowElectrode2:: @ 81637B4
PowerPlant_EventScript_Zapdos:: @ 81637B8
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
@@ -84,7 +84,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_FoughtElectrode1
@@ -113,7 +113,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
dowildbattle
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq PowerPlant_EventScript_FoughtElectrode2
data/maps/Route12/scripts.inc
+1 -1
View File
@@ -15,7 +15,7 @@ Route12_EventScript_Snorlax:: @ 8168014
faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq Route12_EventScript_DontUsePokeFlute
data/maps/Route12_FishingHouse/scripts.inc
+1 -1
View File
@@ -31,7 +31,7 @@ Route12_FishingHouse_EventScript_NoRoomForSuperRod:: @ 816FF75
Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, FALSE
data/maps/Route16/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ Route16_EventScript_Snorlax:: @ 8168121
faceplayer
goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq Route16_EventScript_DontUsePokeFlute
data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70
SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
checkitem ITEM_POKE_DOLL, 1
data/maps/SeafoamIslands_B4F/scripts.inc
+2 -2
View File
@@ -100,7 +100,7 @@ SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121
call_if_lt SeafoamIslands_B4F_EventScript_RideCurrentFar
compare VAR_0x8008, 9
call_if_ge SeafoamIslands_B4F_EventScript_RideCurrentClose
special sub_805D1A8
special SeafoamIslandsB4F_CurrentDumpsPlayerOnLand
setvar VAR_TEMP_1, 0
releaseall
end
@@ -159,7 +159,7 @@ SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA
SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE
data/maps/SixIsland_WaterPath_House1/scripts.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D
lock
faceplayer
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
setvar VAR_0x8004, SPECIES_HERACROSS
specialvar VAR_RESULT, DoesPlayerPartyContainSpecies
compare VAR_RESULT, FALSE
data/maps/ThreeIsland_BerryForest/scripts.inc
+1 -1
View File
@@ -23,7 +23,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83
waitmoncry
setwildbattle SPECIES_HYPNO, 30, ITEM_NONE
dowildbattle
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
applymovement 1, Movement_FacePlayer
waitmovement 0
msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis
data/maps/TwoIsland_House/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ TwoIsland_House_MapScripts:: @ 8171618
TwoIsland_House_EventScript_MoveManiac:: @ 8171619
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
clearflag HAS_BIG_MUSHROOM
data/maps/VermilionCity/scripts.inc
+1 -1
View File
@@ -86,7 +86,7 @@ VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996
VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
call VermilionCity_EventScript_CheckHasMysticTicket
compare VAR_RESULT, TRUE
goto_if_eq VermilionCity_EventScript_HasMysticTicket
data/maps/VermilionCity_Gym/scripts.inc
+1 -1
View File
@@ -142,7 +142,7 @@ VermilionCity_Gym_EventScript_TrashCan15:: @ 816B837
VermilionCity_Gym_EventScript_TrashCan:: @ 816B843
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
copyvar SWITCH1_ID, VAR_TEMP_0
copyvar SWITCH2_ID, VAR_TEMP_1
goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_LocksAlreadyOpen
data/maps/ViridianCity/scripts.inc
+2 -2
View File
@@ -146,7 +146,7 @@ ViridianCity_EventScript_WatchToLearnBasics:: @ 8165A5B
ViridianCity_EventScript_TutorialUnused:: @ 8165A65
msgbox ViridianCity_Text_ThatWasEducationalTakeThis
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
special StartOldManTutorialBattle
waitstate
release
@@ -239,7 +239,7 @@ ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C
msgbox ViridianCity_Text_ShowYouHowToCatchMons
closemessage
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
special StartOldManTutorialBattle
waitstate
lock
data/scripts/cable_club.inc
+8 -8
View File
@@ -15,7 +15,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE
CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
execram
@ Unused
@@ -111,7 +111,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD
CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315
special CloseLink
special HelpSystem_Enable
special sub_811390C
special QuestLog_StartRecordingInputsAfterDeferredEvent
setvar VAR_CABLE_CLUB_STATE, 0
textcolor 1
compare VAR_0x8007, 0
@@ -137,7 +137,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F
CableClub_EventScript_PlayerExitTradeCenter:: @ 81BB367
special CloseLink
special HelpSystem_Enable
special sub_811390C
special QuestLog_StartRecordingInputsAfterDeferredEvent
setvar VAR_CABLE_CLUB_STATE, 0
textcolor 1
compare VAR_0x8007, 0
@@ -161,7 +161,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C
CableClub_EventScript_PlayerExitUnionRoom:: @ 81BB3B4
special HelpSystem_Enable
special sub_811390C
special QuestLog_StartRecordingInputsAfterDeferredEvent
setvar VAR_CABLE_CLUB_STATE, 0
textcolor 1
compare VAR_0x8007, 0
@@ -775,7 +775,7 @@ CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC
CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
@@ -885,7 +885,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92
CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
@@ -1195,7 +1195,7 @@ CableClub_OnResume:: @ 81BC05C
JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
message Text_DescribeWhichGame
@@ -1225,7 +1225,7 @@ CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4
JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
message Text_WelcomeCanYouWait
data/scripts/move_tutors.inc
+2 -2
View File
@@ -448,7 +448,7 @@ EventScript_BodySlamTaught:: @ 81C4DE2
TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
lock
faceplayer
goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves
@@ -556,7 +556,7 @@ EventScript_ChooseMoveTutorMon:: @ 81C4F30
EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37
textcolor 3
special sub_80699BC
special DisableMsgBoxWalkaway
signmsg
msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO
normalmsg
data/scripts/pokedex_rating.inc
+1 -1
View File
@@ -1,6 +1,6 @@
PokedexRating_EventScript_RateInPerson:: @ 81A737B
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro
call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro
call PokedexRating_EventScript_Rate
data/scripts/questionnaire.inc
+1 -1
View File
@@ -29,7 +29,7 @@ EventScript_EnableMysteryGift:: @ 81A774D
msgbox Text_YouKnowThoseWords
setflag FLAG_SYS_MYSTERY_GIFT_ENABLED
textcolor 3
special sub_80699BC
special DisableMsgBoxWalkaway
signmsg
msgbox Text_YouCanAccessMysteryGift
normalmsg
data/scripts/seagallop.inc
+1 -1
View File
@@ -111,7 +111,7 @@ EventScript_SetSail:: @ 81A90DA
closemessage
delay 20
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
fadescreen FADE_TO_BLACK
special DoSeagallopFerryScene
waitstate
data/scripts/trainer_card.inc
+1 -1
View File
@@ -92,7 +92,7 @@ FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994
applymovement 1, Movement_FacePlayer
waitmovement 0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
special QuestLog_OnInteractionWithSpecialNpc
compare VAR_0x8008, 0
goto_if_eq FourIsland_House2_EventScript_NothingToBragAbout
message FourIsland_House2_Text_BragAboutWhatToday
data/specials.inc
+10 -10
View File
@@ -100,7 +100,7 @@ gSpecials:: @ 815FD60
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special NullFieldSpecial
def_special sub_8081128
def_special TryContestLinkup
def_special Field_AskSaveTheGame
def_special DoWateringBerryTreeAnim
def_special ShowEasyChatScreen
@@ -349,14 +349,14 @@ gSpecials:: @ 815FD60
def_special Dummy_TryEnableBravoTrainerBattleTower
def_special DoesPartyHaveEnigmaBerry
def_special NullFieldSpecial
def_special sub_810B82C
def_special SetPostgameFlags
def_special StartMarowakBattle
def_special ForcePlayerOntoBike
def_special ListMenu
def_special ReturnToListMenu
def_special DoPicboxCancel
def_special SetVermilionTrashCans
def_special sub_805D1A8
def_special SeafoamIslandsB4F_CurrentDumpsPlayerOnLand
def_special SampleResortGorgeousMonAndReward
def_special CheckAddCoins
def_special GetDaycarePokemonCount
@@ -364,7 +364,7 @@ gSpecials:: @ 815FD60
def_special ForcePlayerToStartSurfing
def_special GetStarterSpecies
def_special SetSeenMon
def_special sub_810C444
def_special VsSeekerResetObjectMovementAfterChargeComplete
def_special ShouldShowBoxWasFullMessage
def_special ChangeBoxPokemonNickname
def_special UpdateTrainerCardPhotoIcons
@@ -377,8 +377,8 @@ gSpecials:: @ 815FD60
def_special ShowWirelessCommunicationScreen
def_special EnableNationalPokedex
def_special SetWalkingIntoSignVars
def_special sub_80699BC
def_special sub_810C3A4
def_special DisableMsgBoxWalkaway
def_special VsSeekerFreezeObjectsAfterChargeComplete
def_special SetFlavorTextFlagFromSpecialVars
def_special UpdatePickStateFromSpecialVar8005
def_special OverworldWhiteOutGetMoneyLoss
@@ -393,14 +393,14 @@ gSpecials:: @ 815FD60
def_special BackupHelpContext
def_special RestoreHelpContext
def_special ValidateReceivedWonderCard
def_special sub_810B810
def_special SetUnlockedPokedexFlags
def_special InitUnionRoom
def_special BufferUnionRoomPlayerName
def_special sub_811390C
def_special QuestLog_StartRecordingInputsAfterDeferredEvent
def_special GetMartClerkObjectId
def_special BattleCardAction
def_special GetQuestLogState
def_special sub_8112364
def_special QuestLog_OnInteractionWithSpecialNpc
def_special GetMENewsJisanItemAndState
def_special GetPCBoxToSendMon
def_special OpenMuseumFossilPic
@@ -418,7 +418,7 @@ gSpecials:: @ 815FD60
def_special DaisyMassageServices
def_special HelpSystem_Disable
def_special HelpSystem_Enable
def_special sub_810B82C
def_special SetPostgameFlags
def_special CheckHasAtLeastOneBerry
def_special DisplayBerryPowderVendorMenu
def_special RemoveBerryPowderVendorMenu
data/text/decoration_descriptions.inc
-573
View File
@@ -1,573 +0,0 @@
gUnknown_8454238:: @ 8454238
.string "A small desk built\n"
.string "for one.$"
gUnknown_8454254:: @ 8454254
.string "A small desk built in\n"
.string "the shape of a POKé\n"
.string "BALL.$"
gUnknown_8454284:: @ 8454284
.string "A large desk made\n"
.string "of steel. Put some\n"
.string "decorations on it.$"
gUnknown_84542BC:: @ 84542BC
.string "A large desk made\n"
.string "of wood. Put some\n"
.string "decorations on it.$"
gUnknown_84542F3:: @ 84542F3
.string "A large desk made\n"
.string "of leaves. Put some\n"
.string "decorations on it.$"
gUnknown_845432C:: @ 845432C
.string "A huge desk made\n"
.string "of glass. Holds lots\n"
.string "of decorations.$"
gUnknown_8454362:: @ 8454362
.string "A huge desk made\n"
.string "of brick. Holds lots\n"
.string "of decorations.$"
gUnknown_8454398:: @ 8454398
.string "A huge desk made\n"
.string "of logs. Put lots of\n"
.string "decorations on it.$"
gUnknown_84543D1:: @ 84543D1
.string "A huge desk made\n"
.string "of rocks. Holds\n"
.string "many decorations.$"
gUnknown_8454404:: @ 8454404
.string "A small chair made\n"
.string "for one.$"
gUnknown_8454420:: @ 8454420
.string "A small chair built\n"
.string "in the shape of a\n"
.string "POKé BALL.$"
gUnknown_8454451:: @ 8454451
.string "A small chair made\n"
.string "of steel.$"
gUnknown_845446E:: @ 845446E
.string "A small chair made\n"
.string "of glass.$"
gUnknown_845448B:: @ 845448B
.string "A small chair made\n"
.string "of leaves.$"
gUnknown_84544A9:: @ 84544A9
.string "A small chair made\n"
.string "of wood.$"
gUnknown_84544C5:: @ 84544C5
.string "A small chair made\n"
.string "of brick.$"
gUnknown_84544E2:: @ 84544E2
.string "A small chair made\n"
.string "of logs.$"
gUnknown_84544FE:: @ 84544FE
.string "A small chair made\n"
.string "of rock.$"
gUnknown_845451A:: @ 845451A
.string "A vivid red potted\n"
.string "plant.$"
gUnknown_8454534:: @ 8454534
.string "A flowering tropical\n"
.string "plant in a pot.$"
gUnknown_8454559:: @ 8454559
.string "A pot of cute\n"
.string "flowers.$"
gUnknown_8454570:: @ 8454570
.string "A large pot with\n"
.string "many colorful\n"
.string "flowers.$"
gUnknown_8454598:: @ 8454598
.string "A large, umbrella-\n"
.string "shaped plant in a\n"
.string "big pot.$"
gUnknown_84545C6:: @ 84545C6
.string "A large, impressive\n"
.string "plant in a big pot.$"
gUnknown_84545EE:: @ 84545EE
.string "A red-colored brick.\n"
.string "Decorations can be\n"
.string "placed on top.$"
gUnknown_8454625:: @ 8454625
.string "A yellow-colored\n"
.string "brick. Put some\n"
.string "decorations on top.$"
gUnknown_845465A:: @ 845465A
.string "A blue-colored\n"
.string "brick. Put some\n"
.string "decorations on top.$"
gUnknown_845468D:: @ 845468D
.string "A red balloon filled\n"
.string "with water. Bursts\n"
.string "if stepped on.$"
gUnknown_84546C4:: @ 84546C4
.string "A blue balloon filled\n"
.string "with water. Bursts\n"
.string "if stepped on.$"
gUnknown_84546FC:: @ 84546FC
.string "A yellow balloon\n"
.string "filled with water.\n"
.string "Pops if stepped on.$"
gUnknown_8454734:: @ 8454734
.string "A large red tent.\n"
.string "You can hide inside\n"
.string "it.$"
gUnknown_845475E:: @ 845475E
.string "A large blue tent.\n"
.string "You can hide inside\n"
.string "it.$"
gUnknown_8454789:: @ 8454789
.string "Place over a hole to\n"
.string "cross to the other\n"
.string "side.$"
gUnknown_84547B7:: @ 84547B7
.string "Use to slide down\n"
.string "from the platform.$"
gUnknown_84547DC:: @ 84547DC
.string "A small fence that\n"
.string "blocks passage.$"
gUnknown_84547FF:: @ 84547FF
.string "A small fence that\n"
.string "blocks passage.$"
gUnknown_8454822:: @ 8454822
.string "An old large tire.\n"
.string "Decorations can be\n"
.string "placed on top.$"
gUnknown_8454857:: @ 8454857
.string "A large pedestal\n"
.string "with steps.$"
gUnknown_8454874:: @ 8454874
.string "A large ball of mud.\n"
.string "Crumbles if stepped\n"
.string "on.$"
gUnknown_84548A1:: @ 84548A1
.string "A weird door that\n"
.string "people can walk\n"
.string "right through.$"
gUnknown_84548D2:: @ 84548D2
.string "An ornament made\n"
.string "of sand. Crumbles if\n"
.string "touched.$"
gUnknown_8454901:: @ 8454901
.string "Awarded for 50\n"
.string "straight wins at\n"
.string "the BATTLE TOWER.$"
gUnknown_8454933:: @ 8454933
.string "Awarded for 100\n"
.string "straight wins at\n"
.string "the BATTLE TOWER.$"
gUnknown_8454966:: @ 8454966
.string "A glass replica of\n"
.string "a famous sculpture\n"
.string "at the ART MUSEUM.$"
gUnknown_845499F:: @ 845499F
.string "A small, gray-\n"
.string "colored toy TV.$"
gUnknown_84549BE:: @ 84549BE
.string "A toy TV modeled\n"
.string "in the image of a\n"
.string "SEEDOT.$"
gUnknown_84549E9:: @ 84549E9
.string "A toy TV modeled\n"
.string "in the image of a\n"
.string "SKITTY.$"
gUnknown_8454A14:: @ 8454A14
.string "An odd mat that\n"
.string "glitters if stepped\n"
.string "on.$"
gUnknown_8454A3C:: @ 8454A3C
.string "A trick mat that\n"
.string "jumps when it is\n"
.string "stepped on.$"
gUnknown_8454A6A:: @ 8454A6A
.string "A trick mat that\n"
.string "spins around when\n"
.string "stepped on.$"
gUnknown_8454A99:: @ 8454A99
.string "A mat that plays\n"
.string "a low C note when\n"
.string "stepped on.$"
gUnknown_8454AC8:: @ 8454AC8
.string "A mat that plays\n"
.string "a D note when\n"
.string "stepped on.$"
gUnknown_8454AF3:: @ 8454AF3
.string "A mat that plays\n"
.string "an E note when\n"
.string "stepped on.$"
gUnknown_8454B1F:: @ 8454B1F
.string "A mat that plays\n"
.string "an F note when\n"
.string "stepped on.$"
gUnknown_8454B4B:: @ 8454B4B
.string "A mat that plays\n"
.string "a G note when\n"
.string "stepped on.$"
gUnknown_8454B76:: @ 8454B76
.string "A mat that plays\n"
.string "an A note when\n"
.string "stepped on.$"
gUnknown_8454BA2:: @ 8454BA2
.string "A mat that plays\n"
.string "a B note when\n"
.string "stepped on.$"
gUnknown_8454BCD:: @ 8454BCD
.string "A mat that plays\n"
.string "a high C note when\n"
.string "stepped on.$"
gUnknown_8454BFD:: @ 8454BFD
.string "A mat designed with\n"
.string "a SURF image.\n"
.string "Put items on top.$"
gUnknown_8454C31:: @ 8454C31
.string "A mat designed with\n"
.string "a THUNDER image.\n"
.string "Put items on top.$"
gUnknown_8454C68:: @ 8454C68
.string "A mat designed with\n"
.string "a FIRE BLAST image.\n"
.string "Put items on top.$"
gUnknown_8454CA2:: @ 8454CA2
.string "A mat with a POWDER\n"
.string "SNOW image design.\n"
.string "Put items on top.$"
gUnknown_8454CDB:: @ 8454CDB
.string "A mat designed with\n"
.string "an ATTRACT image.\n"
.string "Put items on top.$"
gUnknown_8454D13:: @ 8454D13
.string "A mat designed with\n"
.string "a FISSURE image.\n"
.string "Put items on top.$"
gUnknown_8454D4A:: @ 8454D4A
.string "A mat designed with\n"
.string "a SPIKES image.\n"
.string "Put items on top.$"
gUnknown_8454D80:: @ 8454D80
.string "A small poster\n"
.string "printed with POKé\n"
.string "BALLS.$"
gUnknown_8454DA8:: @ 8454DA8
.string "A small poster with\n"
.string "a TREECKO print.$"
gUnknown_8454DCD:: @ 8454DCD
.string "A small poster with\n"
.string "a TORCHIC print.$"
gUnknown_8454DF2:: @ 8454DF2
.string "A small poster with\n"
.string "a MUDKIP print.$"
gUnknown_8454E16:: @ 8454E16
.string "A small poster with\n"
.string "an AZURILL print.$"
gUnknown_8454E3C:: @ 8454E3C
.string "A large poster with\n"
.string "a PIKACHU and\n"
.string "PICHU print.$"
gUnknown_8454E6B:: @ 8454E6B
.string "A large poster with\n"
.string "a SEVIPER print.$"
gUnknown_8454E90:: @ 8454E90
.string "A large poster with\n"
.string "a RELICANTH print.$"
gUnknown_8454EB7:: @ 8454EB7
.string "A large poster with\n"
.string "a WINGULL print.$"
gUnknown_8454EDC:: @ 8454EDC
.string "A large poster with\n"
.string "a SMOOCHUM print.$"
gUnknown_8454F02:: @ 8454F02
.string "A PICHU doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8454F2D:: @ 8454F2D
.string "A PIKACHU doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8454F5A:: @ 8454F5A
.string "A MARILL doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8454F86:: @ 8454F86
.string "A TOGEPI doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8454FB2:: @ 8454FB2
.string "A CYNDAQUIL doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8454FE1:: @ 8454FE1
.string "A CHIKORITA doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455010:: @ 8455010
.string "A TOTODILE doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_845503E:: @ 845503E
.string "A JIGGLYPUFF doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_845506E:: @ 845506E
.string "A MEOWTH doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_845509A:: @ 845509A
.string "A CLEFAIRY doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84550C8:: @ 84550C8
.string "A DITTO doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84550F3:: @ 84550F3
.string "A SMOOCHUM doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455121:: @ 8455121
.string "A TREECKO doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_845514E:: @ 845514E
.string "A TORCHIC doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_845517B:: @ 845517B
.string "A MUDKIP doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84551A7:: @ 84551A7
.string "A DUSKULL doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84551D4:: @ 84551D4
.string "A WYNAUT doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455200:: @ 8455200
.string "A BALTOY doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_845522C:: @ 845522C
.string "A KECLEON doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455259:: @ 8455259
.string "An AZURILL doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455287:: @ 8455287
.string "A SKITTY doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84552B3:: @ 84552B3
.string "A SWABLU doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84552DF:: @ 84552DF
.string "A GULPIN doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_845530B:: @ 845530B
.string "A LOTAD doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455336:: @ 8455336
.string "A SEEDOT doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455362:: @ 8455362
.string "A PIKACHU cushion.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455392:: @ 8455392
.string "A MARILL cushion.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84553C1:: @ 84553C1
.string "A SMOOCHUM\n"
.string "cushion. Place it on\n"
.string "a mat or a desk.$"
gUnknown_84553F2:: @ 84553F2
.string "A ZIGZAGOON\n"
.string "cushion. Place it on\n"
.string "a mat or a desk.$"
gUnknown_8455424:: @ 8455424
.string "A SPINDA cushion.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455453:: @ 8455453
.string "A SABLEYE cushion.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455483:: @ 8455483
.string "A BALL cushion.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84554B0:: @ 84554B0
.string "A grass-mark\n"
.string "cushion. Place it on\n"
.string "a mat or a desk.$"
gUnknown_84554E3:: @ 84554E3
.string "A fire-mark\n"
.string "cushion. Place it on\n"
.string "a mat or a desk.$"
gUnknown_8455515:: @ 8455515
.string "A water-mark\n"
.string "cushion. Place it on\n"
.string "a mat or a desk.$"
gUnknown_8455548:: @ 8455548
.string "A large doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455573:: @ 8455573
.string "A large doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_845559E:: @ 845559E
.string "A large doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84555C9:: @ 84555C9
.string "A large doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84555F4:: @ 84555F4
.string "A large doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_845561F:: @ 845561F
.string "A large doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_845564A:: @ 845564A
.string "A large doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_8455675:: @ 8455675
.string "A large doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84556A0:: @ 84556A0
.string "A large doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
gUnknown_84556CB:: @ 84556CB
.string "A large doll.\n"
.string "Place it on a mat\n"
.string "or a desk.$"
graphics/intro/unk_8402650.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 81 B

After

Width:  |  Height:  |  Size: 138 B

graphics/intro/unk_840272C.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 448 B

After

Width:  |  Height:  |  Size: 380 B

graphics/intro/unk_84028F8.bin
BIN
View File
Binary file not shown.
graphics/intro/unk_84028F8.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 351 B

graphics/intro/unk_8402B2C.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 333 B

graphics/intro/unk_8402CD4.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 157 B

After

Width:  |  Height:  |  Size: 216 B

graphics/intro/unk_8402D54.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

graphics/intro/unk_84048EC.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

graphics/intro/unk_8405414.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

graphics/intro/unk_8405B28.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 426 B

graphics/intro/unk_8406654.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

graphics/intro/unk_8407470.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

graphics/intro/unk_840926C.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 807 B

After

Width:  |  Height:  |  Size: 872 B

graphics/intro/unk_84096CC.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 649 B

graphics/intro/unk_8409A3C.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 541 B

After

Width:  |  Height:  |  Size: 578 B

graphics/intro/unk_8409D20.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

graphics/intro/unk_840A3E4.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

graphics/intro/unk_840B874.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 384 B

After

Width:  |  Height:  |  Size: 451 B

graphics/intro/unk_840BAE0.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 164 B

After

Width:  |  Height:  |  Size: 234 B

graphics_file_rules.mk
+10
View File
@@ -26,6 +26,7 @@ ITEMPCGFXDIR := graphics/item_pc
TITLESCREENGFXDIR := graphics/title_screen
CREDITSGFXDIR := graphics/credits
ITEMMENUGFXDIR := graphics/item_menu
INTROGFXDIR := graphics/intro
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
contest_types := cool beauty cute smart tough
@@ -534,3 +535,12 @@ graphics/misc/emoticons.4bpp: %.4bpp: %.png
$(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 55
$(INTROGFXDIR)/unk_8402D54.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 397
$(INTROGFXDIR)/unk_8406654.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 170
$(INTROGFXDIR)/unk_8405B28.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 17
include/battle_anim.h
+9 -9
View File
@@ -412,9 +412,9 @@ void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 x
void sub_8075AD8(struct Sprite *sprite);
u16 ArcTan2Neg(s16 a, s16 b);
void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor);
u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7);
u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4);
u8 sub_8075D80(u8 a1);
u32 SelectBattleAnimSpriteAndBgPalettes(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 a6, bool8 a7);
u32 SelectBattlerSpritePalettes(bool8 playerLeft, bool8 playerRight, bool8 foeLeft, bool8 foeRight);
u8 GetSpritePalIdxByBattler(u8 a1);
void AnimSpriteOnMonPos(struct Sprite *sprite);
void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
void AnimThrowProjectile(struct Sprite *sprite);
@@ -468,7 +468,7 @@ void sub_8099BD4(u8 taskId);
extern const struct SpriteTemplate gUnknown_83E7C98;
extern const struct SpriteTemplate gBasicHitSplatSpriteTemplate;
u32 UnpackSelectedBattleAnimPalettes(s16 selector);
void sub_80B9BDC(u8 taskId);
void AnimTask_CurseBlendEffect(u8 taskId);
void sub_80B9CE4(u8 taskId);
void sub_80B9E58(u8 taskId);
void sub_80B9F6C(u8 taskId);
@@ -561,13 +561,13 @@ void AnimWaterPulseRing(struct Sprite *sprite);
u8 SmokescreenImpact(s16 x, s16 y, u8 a3);
// battle_anim_utility_funcs.c
void sub_80BA7F8(u8 taskId);
void sub_80BA83C(u8 taskId);
void AnimTask_BlendSelected(u8 taskId);
void AnimTask_BlendExcept(u8 taskId);
void AnimTask_SetCamouflageBlend(u8 taskId);
void AnimTask_BlendParticle(u8 taskId);
void sub_80BAB38(u8 taskId);
void sub_80BAB98(u8 taskId);
void sub_80BACEC(u8 taskId);
void AnimTask_HardwarePaletteFade(u8 taskId);
void AnimTask_CloneBattlerSpriteWithBlend(u8 taskId);
void AnimTask_SetUpCurseBackground(u8 taskId);
void sub_80BB088(u8 taskId);
void sub_80BB660(u8 taskId);
void sub_80BB7DC(u8 taskId);
include/bike.h
+2 -2
View File
@@ -25,8 +25,8 @@ enum
ACRO_STATE_TURN_JUMP,
};
void sub_80BD620(u32 directionHistory, u32 abStartSelectHistory);
bool8 sub_80BD540(void);
void InitPlayerAvatarBikeState(u32 directionHistory, u32 abStartSelectHistory);
bool8 MetatileAtPlayerPositionForbidsBiking(void);
void StartTransitionToFlipBikeState(u8 flags);
s16 GetPlayerSpeed(void);
bool8 sub_80BD460(u8);
include/constants/flags.h
+1 -1
View File
@@ -1437,7 +1437,7 @@
// SPECIAL FLAGS (unknown purpose)
#define SPECIAL_FLAGS_START 0x4000
#define SPECIAL_FLAGS_COUNT 16
#define FLAG_SPECIAL_FLAG_0x4000 0x4000
#define FLAG_DONT_SHOW_MAP_NAME_POPUP 0x4000
#define FLAG_DONT_TRANSITION_MUSIC 0x4001
#define FLAG_SPECIAL_FLAG_0x4002 0x4002
#define FLAG_SPECIAL_FLAG_0x4003 0x4003
include/decoration.h
+55
View File
@@ -0,0 +1,55 @@
#ifndef GUARD_DECORATION_H
#define GUARD_DECORATION_H
enum DecorationPermission
{
/*
* The nomenclature here describes collision and placement permissions, in that order.
*/
DECORPERM_SOLID_FLOOR,
DECORPERM_PASS_FLOOR,
DECORPERM_BEHIND_FLOOR,
DECORPERM_NA_WALL,
DECORPERM_SPRITE,
};
enum DecorationShape
{
DECORSHAPE_1x1,
DECORSHAPE_2x1,
DECORSHAPE_3x1, // unused
DECORSHAPE_4x2,
DECORSHAPE_2x2,
DECORSHAPE_1x2,
DECORSHAPE_1x3, // unused
DECORSHAPE_2x4,
DECORSHAPE_3x3,
DECORSHAPE_3x2,
};
enum DecorationCategory
{
DECORCAT_DESK,
DECORCAT_CHAIR,
DECORCAT_PLANT,
DECORCAT_ORNAMENT,
DECORCAT_MAT,
DECORCAT_POSTER,
DECORCAT_DOLL,
DECORCAT_CUSHION,
DECORCAT_COUNT,
};
struct Decoration
{
u8 id;
u8 name[16];
u8 permission;
u8 shape;
u8 category;
u16 price;
const u8 *description;
const u16 *tiles;
};
#endif //GUARD_DECORATION_H
include/event_scripts.h
+1 -1
View File
@@ -1254,7 +1254,7 @@ extern const u8 EventScript_CurrentTooFast[];
extern const u8 EventScript_UseSurf[];
extern const u8 EventScript_Waterfall[];
extern const u8 EventScript_CantUseWaterfall[];
extern const u8 gUnknown_81A8CED[];
extern const u8 EventScript_VsSeekerChargingDone[];
extern const u8 EventScript_FieldPoison[];
extern const u8 EventScript_EggHatch[];
extern const u8 EventScript_1C1361[];
include/field_player_avatar.h
+1 -1
View File
@@ -15,7 +15,7 @@ void MovePlayerNotOnBike(u8 direction, u16 heldKeys);
void MovementType_Player(struct Sprite * sprite);
void sub_805C270(void);
void sub_805C780(void);
void StopPlayerAvatar(void);
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
u8 GetPlayerAvatarGraphicsIdByStateId(u8);
void SetPlayerAvatarStateMask(u8 mask);
include/global.fieldmap.h
+1
View File
@@ -333,6 +333,7 @@ enum
COLLISION_ISOLATED_HORIZONTAL_RAIL,
COLLISION_VERTICAL_RAIL,
COLLISION_HORIZONTAL_RAIL,
COLLISION_COUNT
};
// player running states
include/intro.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef GUARD_INTRO_H
#define GUARD_INTRO_H
void sub_80EC864(void);
void CB2_CopyrightScreen(void);
void c2_copyright_1(void);
#endif //GUARD_INTRO_H
include/link.h
+2 -2
View File
@@ -79,8 +79,8 @@
#define LINKTYPE_BATTLE_TOWER 0x2288
#define LINKTYPE_0x3311 0x3311
#define LINKTYPE_0x3322 0x3322
#define LINKTYPE_0x4411 0x4411
#define LINKTYPE_0x6601 0x6601
#define LINKTYPE_BERRY_BLENDER_SETUP 0x4411
#define LINKTYPE_CONTEST_GMODE 0x6601
#define MASTER_HANDSHAKE 0x8FFF
#define SLAVE_HANDSHAKE 0xB9A0
include/menu_helpers.h
+1 -1
View File
@@ -15,7 +15,7 @@ struct YesNoFuncTable
};
bool16 RunTextPrinters_CheckActive(u8 textPrinterId);
bool32 sub_80BF72C(void);
bool32 MenuHelpers_CallLinkSomething(void);
bool8 sub_80BF748(void);
bool8 MenuHelpers_LinkSomething(void);
void SetVBlankHBlankCallbacksToNull(void);
include/overworld.h
+2 -2
View File
@@ -81,7 +81,7 @@ void SetWarpDestinationToEscapeWarp(void);
void SetWarpDestinationToLastHealLocation(void);
u8 IsMapTypeOutdoors(u8 mapType);
void Overworld_ClearSavedMusic(void);
bool32 sub_8056124(u16 song);
bool32 Overworld_MusicCanOverrideMapMusic(u16 song);
void player_avatar_init_params_reset(void);
@@ -146,7 +146,7 @@ bool8 BGMusicStopped(void);
bool8 IsMapTypeIndoors(u8 mapType);
bool32 Overworld_IsBikingAllowed(void);
void Overworld_ResetStateAfterDigEscRope(void);
bool32 sub_8058244(void);
bool32 Overworld_LinkRecvQueueLengthMoreThan2(void);
u8 GetCurrentMapType(void);
u8 GetLastUsedWarpMapType(void);
include/quest_log.h
+3 -3
View File
@@ -9,7 +9,7 @@
extern u8 gQuestLogState;
extern u8 gUnknown_3005E88;
extern const u16 gUnknown_84566A8[];
extern struct FieldInput gUnknown_3005E90;
extern struct FieldInput gQuestLogFieldInput;
void sub_8112720(u8);
void SetQuestLogEvent(u16, const u16 *);
@@ -27,8 +27,8 @@ void sub_8111CF0(void);
void ResetQuestLog(void);
void ResetTrainerFanClub(void);
void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId);
void sub_8112450(void);
void sub_8112364(void);
void SaveQuestLogData(void);
void QuestLog_OnInteractionWithSpecialNpc(void);
u8 sub_8112CAC(void);
void sub_81138F8(void);
void sub_811231C(void);
include/save_location.h
+2 -2
View File
@@ -10,7 +10,7 @@
void TrySetMapSaveWarpStatus(void);
bool32 IsCurMapPokeCenter(void);
void sub_810B810(void);
void sub_810B82C(void);
void SetUnlockedPokedexFlags(void);
void SetPostgameFlags(void);
#endif // GUARD_SAVE_LOCATION_H
include/script.h
+1 -1
View File
@@ -78,7 +78,7 @@ u8 GetRegisteredQuestLogInput(void);
void ResetFacingNpcOrSignPostVars(void);
bool8 CanWalkAwayToCancelMsgBox(void);
void SetWalkingIntoSignVars(void);
bool8 sub_80699D4(void);
bool8 IsMsgBoxWalkawayDisabled(void);
extern const u8 *gRAMScriptPtr;
extern u8 gWalkAwayFromSignInhibitTimer;
include/strings.h
+1 -1
View File
@@ -916,7 +916,7 @@ extern const u8 gText_GiveUpTryingToTeachNewMove[];
extern const u8 gText_DecimalPoint[];
// map_name_popup
extern const u8 gUnknown_841D18D[];
extern const u8 gText_Rooftop2[];
// option menu
extern const u8 gText_TextSpeed[];
include/vs_seeker.h
+1 -5
View File
@@ -3,18 +3,14 @@
#include "global.h"
void sub_810C604(void);
void sub_810C640(void);
void Task_VsSeeker_0(u8 taskId);
void sub_810CB90(void);
void sub_810CDE8(void);
int GetRematchTrainerId(u16 a0);
bool8 sub_810CF04(u8 a0);
u8 sub_810CF54();
void sub_810D0D0(void);
void sub_810CB90(void);
bool8 sub_810C4EC(void);
bool8 UpdateVsSeekerStepCounter(void);
void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum);
#endif //GUARD_VS_SEEKER_H
ld_script.txt
+1 -1
View File
@@ -546,7 +546,7 @@ SECTIONS {
src/vs_seeker.o(.rodata);
src/item_pc.o(.rodata);
src/mailbox_pc.o(.rodata);
data/decorations.o(.rodata);
src/decoration.o(.rodata);
src/menu.o(.rodata);
src/quest_log.o(.rodata);
src/union_room.o(.rodata);
src/AgbRfu_LinkManager.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "librfu.h"
#include "link_rfu.h"
#include "AgbRfu_LinkManager.h"
#define RN_ACCEPT 0x01
#define RN_NAME_TIMER_CLEAR 0x02
src/bag.c
+1 -3
View File
@@ -1,8 +1,6 @@
#include "global.h"
#include "palette.h"
#include "gflib.h"
#include "item_menu.h"
#include "text.h"
#include "window.h"
#include "text_window.h"
#include "menu_helpers.h"
#include "new_menu_helpers.h"
src/battle_ai_script_commands.c
-1
View File
@@ -4,7 +4,6 @@
#include "util.h"
#include "item.h"
#include "random.h"
#include "pokemon.h"
#include "battle_ai_script_commands.h"
#include "constants/species.h"
#include "constants/abilities.h"
src/battle_ai_switch_items.c
-1
View File
@@ -2,7 +2,6 @@
#include "battle.h"
#include "battle_anim.h"
#include "battle_controllers.h"
#include "pokemon.h"
#include "random.h"
#include "util.h"
#include "constants/abilities.h"
src/battle_anim.c
+6 -8
View File
@@ -1,20 +1,13 @@
#include "global.h"
#include "gflib.h"
#include "battle.h"
#include "battle_anim.h"
#include "battle_controllers.h"
#include "battle_interface.h"
#include "battle_bg.h"
#include "bg.h"
#include "decompress.h"
#include "dma3.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "main.h"
#include "m4a.h"
#include "palette.h"
#include "pokemon.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
#include "constants/battle_anim.h"
@@ -1970,6 +1963,11 @@ static void ScriptCmd_unloadspritegfx(void)
ClearSpriteIndex(GET_TRUE_SPRITE_INDEX(index));
}
// Create sprite from template and init data array with varargs
// args: template, flags, va_args
// flags:
// - bits 0-6: subpriority mod (signed)
// - bit 7: target if set else attacker
static void ScriptCmd_createsprite(void)
{
s32 i;
src/battle_anim_effects_1.c
+4 -6
View File
@@ -1,10 +1,8 @@
#include "global.h"
#include "gflib.h"
#include "battle_anim.h"
#include "battle_interface.h"
#include "gpu_regs.h"
#include "palette.h"
#include "random.h"
#include "sound.h"
#include "trig.h"
#include "util.h"
#include "constants/songs.h"
@@ -4321,7 +4319,7 @@ static void AnimLockOnTargetStep4(struct Sprite* sprite)
sprite->data[1] = 0;
}
BlendPalettes(sub_8075BE8(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB_WHITE);
BlendPalettes(SelectBattleAnimSpriteAndBgPalettes(1, 1, 1, 1, 1, 0, 0), sprite->data[1], RGB_WHITE);
if (sprite->data[1] == 16)
{
int pal;
@@ -4981,7 +4979,7 @@ void AnimTask_FadeScreenBlueStep(u8);
void AnimTask_FadeScreenBlue(u8 taskId)
{
int a = sub_8075BE8(1, 0, 0, 0, 0, 0, 0) & 0xFFFF;
int a = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0) & 0xFFFF;
int b;
int c;
int d;
@@ -4996,7 +4994,7 @@ void AnimTask_FadeScreenBlue(u8 taskId)
gTasks[taskId].data[7] = 13;
gTasks[taskId].data[8] = 14;
gTasks[taskId].data[9] = 15;
b = sub_8075CB8(1, 1, 1, 1);
b = SelectBattlerSpritePalettes(1, 1, 1, 1);
c = a | b;
StorePointerInVars(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void*)c);
b = b | (0x10000 << IndexOfSpritePaletteTag(ANIM_TAG_MOON));
src/battle_anim_effects_2.c
+2 -5
View File
@@ -1,15 +1,12 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "battle_anim.h"
#include "battle_interface.h"
#include "decompress.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "math_util.h"
#include "palette.h"
#include "random.h"
#include "scanline_effect.h"
#include "sound.h"
#include "trig.h"
#include "util.h"
#include "constants/songs.h"
@@ -3090,7 +3087,7 @@ static void FakeOutStep2(u8 taskId)
{
gTasks[taskId].data[11] = 0x88;
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_LIGHTEN);
BlendPalettes(sub_8075BE8(1, 0, 0, 0, 0, 0, 0), 16, RGB_WHITE);
BlendPalettes(SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0), 16, RGB_WHITE);
}
else if (gTasks[taskId].data[10] > 4)
{
src/battle_anim_effects_3.c
+1 -7
View File
@@ -1,19 +1,13 @@
#include "global.h"
#include "malloc.h"
#include "gflib.h"
#include "battle.h"
#include "battle_anim.h"
#include "bg.h"
#include "data.h"
#include "decompress.h"
#include "dma3.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "palette.h"
#include "pokemon_icon.h"
#include "random.h"
#include "scanline_effect.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
#include "trig.h"
#include "util.h"
src/battle_anim_mons.c
+9 -14
View File
@@ -1,14 +1,9 @@
#include "global.h"
#include "gflib.h"
#include "battle_anim.h"
#include "bg.h"
#include "data.h"
#include "decompress.h"
#include "dma3.h"
#include "gpu_regs.h"
#include "malloc.h"
#include "palette.h"
#include "pokemon_icon.h"
#include "sprite.h"
#include "task.h"
#include "trig.h"
#include "util.h"
@@ -1240,7 +1235,7 @@ void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor)
}
}
u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7)
u32 SelectBattleAnimSpriteAndBgPalettes(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 a6, bool8 a7)
{
u32 selectedPalettes = 0;
u32 shift;
@@ -1286,19 +1281,19 @@ u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner,
return selectedPalettes;
}
u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4)
u32 SelectBattlerSpritePalettes(bool8 playerLeft, bool8 playerRight, bool8 foeLeft, bool8 foeRight)
{
u32 var = 0;
u32 shift;
if (a1)
if (playerLeft)
{
if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)))
{
var |= 1 << (GetBattlerAtPosition(B_POSITION_PLAYER_LEFT) + 16);
}
}
if (a2)
if (playerRight)
{
if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)))
{
@@ -1306,7 +1301,7 @@ u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4)
var |= 1 << shift;
}
}
if (a3)
if (foeLeft)
{
if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)))
{
@@ -1314,7 +1309,7 @@ u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4)
var |= 1 << shift;
}
}
if (a4)
if (foeRight)
{
if (IsBattlerSpriteVisible(GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)))
{
@@ -1325,13 +1320,13 @@ u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4)
return var;
}
u8 sub_8075D80(u8 a1)
u8 GetSpritePalIdxByBattler(u8 a1)
{
return a1;
}
// not used
static u8 GetBattlerAtPosition_(u8 position)
static u8 GetSpritePalIdxByPosition(u8 position)
{
return GetBattlerAtPosition(position);
}
src/battle_anim_sound_tasks.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "gflib.h"
#include "battle.h"
#include "battle_anim.h"
#include "sound.h"
#include "task.h"
#include "constants/battle_anim.h"
#include "constants/species.h"
src/battle_anim_special.c
+2 -7
View File
@@ -1,19 +1,14 @@
#include "global.h"
#include "gflib.h"
#include "battle.h"
#include "battle_anim.h"
#include "battle_main.h"
#include "battle_controllers.h"
#include "battle_interface.h"
#include "decompress.h"
#include "dma3.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "m4a.h"
#include "main.h"
#include "palette.h"
#include "pokeball.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
#include "trig.h"
#include "util.h"
@@ -666,7 +661,7 @@ void sub_80EF344(u8 taskId)
priority = gSprites[spriteId].oam.priority;
subpriority = gSprites[spriteId].subpriority;
gTasks[taskId].data[10] = LaunchBallStarsTask(x, y + 32, priority, subpriority, ballId);
selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0);
selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0);
gTasks[taskId].data[11] = LaunchBallFadeMonTask(0, gBattleAnimAttacker, selectedPalettes, ballId);
gTasks[taskId].data[0]++;
break;
src/battle_anim_status_effects.c
+1 -3
View File
@@ -1,10 +1,8 @@
#include "global.h"
#include "gflib.h"
#include "battle.h"
#include "battle_anim.h"
#include "decompress.h"
#include "gpu_regs.h"
#include "palette.h"
#include "sprite.h"
#include "task.h"
#include "trig.h"
#include "util.h"
src/battle_anim_utility_funcs.c
+49 -29
View File
@@ -1,12 +1,8 @@
#include "global.h"
#include "gflib.h"
#include "battle.h"
#include "battle_anim.h"
#include "gpu_regs.h"
#include "graphics.h"
#include "malloc.h"
#include "palette.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
#include "util.h"
#include "constants/songs.h"
@@ -22,9 +18,9 @@ struct AnimStatsChangeData
static void StartBlendAnimSpriteColor(u8 taskId, u32 selectedPalettes);
static void AnimTask_BlendSpriteColor_Step2(u8 taskId);
static void sub_80BAB78(u8 taskId);
static void sub_80BABD0(u8 taskId);
static void sub_80BACA8(struct Sprite *sprite);
static void Task_WaitHardwarePaletteFade(u8 taskId);
static void Task_DoCloneBattlerSpriteWithBlend(u8 taskId);
static void Task_FinishCloneBattlerSpriteWithBlend(struct Sprite *sprite);
static void sub_80BAF38(u8 taskId);
static void sub_80BB0D8(u8 taskId);
static void sub_80BB2A0(u8 taskId);
@@ -41,18 +37,42 @@ static const u16 gUnknown_83E7CC8[] = { RGB(31, 31, 31) };
const u8 gUnknown_83E7CCA[] = { REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT };
const u8 gUnknown_83E7CCE[] = { REG_OFFSET_BG0CNT, REG_OFFSET_BG1CNT, REG_OFFSET_BG2CNT, REG_OFFSET_BG3CNT };
void sub_80BA7F8(u8 taskId)
// gBattleAnimArgs[0] is a bitfield.
// Bits 0-10 result in the following palettes being selected:
// 0: battle background palettes (BG palettes 1, 2, and 3)
// 1: gBattleAnimAttacker OBJ palette
// 2: gBattleAnimTarget OBJ palette
// 3: gBattleAnimAttacker partner OBJ palette
// 4: gBattleAnimTarget partner OBJ palette
// 5: BG palette 4
// 6: BG palette 5
// 7: Player battler left
// 8: Player battler right
// 9: Enemy battler left
// 10: Enemy battler right
void AnimTask_BlendSelected(u8 taskId)
{
u32 selectedPalettes = UnpackSelectedBattleAnimPalettes(gBattleAnimArgs[0]);
selectedPalettes |= sub_8075CB8((gBattleAnimArgs[0] >> 7) & 1,
(gBattleAnimArgs[0] >> 8) & 1,
(gBattleAnimArgs[0] >> 9) & 1,
(gBattleAnimArgs[0] >> 10) & 1);
selectedPalettes |= SelectBattlerSpritePalettes(
(gBattleAnimArgs[0] >> 7) & 1,
(gBattleAnimArgs[0] >> 8) & 1,
(gBattleAnimArgs[0] >> 9) & 1,
(gBattleAnimArgs[0] >> 10) & 1);
StartBlendAnimSpriteColor(taskId, selectedPalettes);
}
void sub_80BA83C(u8 taskId)
// gBattleAnimArgs[0] is a command ID
// This command will blend bg and battlers except as commanded:
// 0: Not attacker
// 1: Not target
// 2: Not attacker nor bg
// 3: Not target nor bg
// 4: Neither attacker nor target
// 5: Blend all
// 6: Neither bg nor attacker's partner
// 7: Neither bg nor target's partner
void AnimTask_BlendExcept(u8 taskId)
{
u8 battler;
u32 selectedPalettes;
@@ -95,7 +115,7 @@ void sub_80BA83C(u8 taskId)
if (battler != animBattlers[0]
&& battler != animBattlers[1]
&& IsBattlerSpriteVisible(battler))
selectedPalettes |= 0x10000 << sub_8075D80(battler);
selectedPalettes |= 0x10000 << GetSpritePalIdxByBattler(battler);
}
StartBlendAnimSpriteColor(taskId, selectedPalettes);
}
@@ -190,23 +210,23 @@ static void AnimTask_BlendSpriteColor_Step2(u8 taskId)
}
}
void sub_80BAB38(u8 taskId)
void AnimTask_HardwarePaletteFade(u8 taskId)
{
BeginHardwarePaletteFade(gBattleAnimArgs[0],
gBattleAnimArgs[1],
gBattleAnimArgs[2],
gBattleAnimArgs[3],
gBattleAnimArgs[4]);
gTasks[taskId].func = sub_80BAB78;
gTasks[taskId].func = Task_WaitHardwarePaletteFade;
}
static void sub_80BAB78(u8 taskId)
static void Task_WaitHardwarePaletteFade(u8 taskId)
{
if (!gPaletteFade.active)
DestroyAnimVisualTask(taskId);
}
void sub_80BAB98(u8 taskId)
void AnimTask_CloneBattlerSpriteWithBlend(u8 taskId)
{
struct Task *task = &gTasks[taskId];
@@ -216,9 +236,9 @@ void sub_80BAB98(u8 taskId)
task->data[3] = gBattleAnimArgs[2];
task->data[4] = gBattleAnimArgs[3];
task->data[5] = 0;
task->func = sub_80BABD0;
task->func = Task_DoCloneBattlerSpriteWithBlend;
}
static void sub_80BABD0(u8 taskId)
static void Task_DoCloneBattlerSpriteWithBlend(u8 taskId)
{
struct Task *task = &gTasks[taskId];
@@ -237,7 +257,7 @@ static void sub_80BABD0(u8 taskId)
gSprites[task->data[6]].data[0] = task->data[3];
gSprites[task->data[6]].data[1] = taskId;
gSprites[task->data[6]].data[2] = 5;
gSprites[task->data[6]].callback = sub_80BACA8;
gSprites[task->data[6]].callback = Task_FinishCloneBattlerSpriteWithBlend;
++task->data[5];
}
--task->data[4];
@@ -250,7 +270,7 @@ static void sub_80BABD0(u8 taskId)
}
}
static void sub_80BACA8(struct Sprite *sprite)
static void Task_FinishCloneBattlerSpriteWithBlend(struct Sprite *sprite)
{
if (sprite->data[0])
{
@@ -263,7 +283,7 @@ static void sub_80BACA8(struct Sprite *sprite)
}
}
void sub_80BACEC(u8 taskId)
void AnimTask_SetUpCurseBackground(u8 taskId)
{
u16 species;
s32 newSpriteId;
@@ -559,11 +579,11 @@ static void sub_80BB4B8(u8 taskId)
void sub_80BB660(u8 taskId)
{
u32 selectedPalettes = sub_8075CB8(1, 1, 1, 1);
u32 selectedPalettes = SelectBattlerSpritePalettes(1, 1, 1, 1);
sub_80BB790(selectedPalettes, 0);
gTasks[taskId].data[14] = selectedPalettes >> 16;
selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0) & 0xFFFF;
selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0) & 0xFFFF;
sub_80BB790(selectedPalettes, 0xFFFF);
gTasks[taskId].data[15] = selectedPalettes;
gTasks[taskId].data[0] = 0;
@@ -835,7 +855,7 @@ void sub_80BBE6C(u8 taskId)
s32 paletteIndex = 0;
if (gBattleAnimArgs[0] == 0)
for (selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0);
for (selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0);
(selectedPalettes & 1) == 0;
++paletteIndex)
selectedPalettes >>= 1;
@@ -853,7 +873,7 @@ void sub_80BBF08(u8 taskId)
s32 paletteIndex = 0;
if (gBattleAnimArgs[0] == 0)
for (selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0);
for (selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0);
(selectedPalettes & 1) == 0;
++paletteIndex)
selectedPalettes >>= 1;
@@ -871,7 +891,7 @@ void sub_80BBFA4(u8 taskId)
s32 paletteIndex = 0;
if (gBattleAnimArgs[0] == 0)
for (selectedPalettes = sub_8075BE8(1, 0, 0, 0, 0, 0, 0);
for (selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0);
(selectedPalettes & 1) == 0;
++paletteIndex)
selectedPalettes >>= 1;
src/battle_controller_link_opponent.c
+1 -5
View File
@@ -1,14 +1,10 @@
#include "global.h"
#include "gflib.h"
#include "data.h"
#include "link.h"
#include "m4a.h"
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "sound.h"
#include "string_util.h"
#include "task.h"
#include "text.h"
#include "util.h"
#include "battle.h"
#include "battle_anim.h"
src/battle_controller_link_partner.c
+1 -5
View File
@@ -1,13 +1,9 @@
#include "global.h"
#include "gflib.h"
#include "data.h"
#include "link.h"
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "sound.h"
#include "string_util.h"
#include "task.h"
#include "text.h"
#include "util.h"
#include "battle.h"
#include "battle_anim.h"
src/battle_controller_oak_old_man.c
+1 -8
View File
@@ -1,21 +1,14 @@
#include "global.h"
#include "gflib.h"
#include "task.h"
#include "pokemon.h"
#include "pokeball.h"
#include "party_menu.h"
#include "bg.h"
#include "data.h"
#include "palette.h"
#include "util.h"
#include "m4a.h"
#include "link.h"
#include "sound.h"
#include "item.h"
#include "item_menu.h"
#include "text.h"
#include "strings.h"
#include "string_util.h"
#include "window.h"
#include "battle.h"
#include "battle_anim.h"
#include "battle_controllers.h"
src/battle_controller_opponent.c
+1 -5
View File
@@ -1,15 +1,11 @@
#include "global.h"
#include "gflib.h"
#include "data.h"
#include "main.h"
#include "m4a.h"
#include "task.h"
#include "text.h"
#include "util.h"
#include "pokeball.h"
#include "pokemon.h"
#include "random.h"
#include "sound.h"
#include "string_util.h"
#include "battle.h"
#include "battle_anim.h"
#include "battle_controllers.h"
src/battle_controller_player.c
+1 -8
View File
@@ -1,23 +1,16 @@
#include "global.h"
#include "bg.h"
#include "gflib.h"
#include "data.h"
#include "item.h"
#include "item_menu.h"
#include "link.h"
#include "main.h"
#include "m4a.h"
#include "palette.h"
#include "party_menu.h"
#include "pokeball.h"
#include "pokemon.h"
#include "sound.h"
#include "strings.h"
#include "string_util.h"
#include "pokemon_special_anim.h"
#include "task.h"
#include "text.h"
#include "util.h"
#include "window.h"
#include "battle.h"
#include "battle_anim.h"
#include "battle_controllers.h"

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