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

Merge branch 'master' of https://github.com/pret/pokeemerald

Browse Source
This commit is contained in:
Diegoisawesome committed 2018-01-07 18:47:05 -06:00
2 parents a11c65ff1a 75c359e300
commit 75f9c16504
1232 files changed
+50083 -6974
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+1 -2
View File
@@ -15,8 +15,7 @@
*.latfont
*.hwjpnfont
*.fwjpnfont
src/*.s
tools/*
tools/agbcc
*.map
*.ld
*.bat
INSTALL.md
+17 -2
View File
@@ -2,12 +2,27 @@ First, you must put a Pokémon Emerald (US) ROM in the root directory of the rep
# Linux
TBD
Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM).
Make sure that there is an environment variable called DEVKITARM with the path of the directory before the "bin" directory containing "arm-none-eabi-as", "arm-none-eabi-cpp", "arm-none-eabi-ld" and "arm-none-eabi-objcopy".
Then get the compiler from https://github.com/pret/agbcc and run the following commands.
build.sh
install.sh PATH_OF_POKEEMERALD_DIRECTORY
Then in the pokeemerald directory, build the tools.
build_tools.sh
Finally, build the rom.
make
# Windows
Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM).
Then download [**pokeruby-tools**](https://github.com/pret/pokeruby-tools). Copy the `tools/` folder with the compiled `exe`s to the `tools/` folder in your `pokeemerald/` directory.
Then get the compiled tools from https://github.com/pret/pokeruby-tools. Copy the `tools/` folder over the `tools/` folder in your pokeemerald directory.
You can then build pokeemerald using `make` in the MSYS environment provided with devkitARM.
README.md
+4
View File
@@ -13,18 +13,22 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
* Disassembly of [**Pokémon Red/Blue**][pokered]
* Disassembly of [**Pokémon Yellow**][pokeyellow]
* Disassembly of [**Pokémon Gold**][pokegold]
* Disassembly of [**Pokémon Crystal**][pokecrystal]
* Disassembly of [**Pokémon Pinball**][pokepinball]
* Disassembly of [**Pokémon TCG**][poketcg]
* Disassembly of [**Pokémon Ruby**][pokeruby]
* Disassembly of [**Pokémon Fire Red**][pokefirered]
* Discord: [**pret**][Discord]
* irc: **irc.freenode.net** [**#pret**][irc]
[pokered]: https://github.com/pret/pokered
[pokeyellow]: https://github.com/pret/pokeyellow
[pokegold]: https://github.com/pret/pokegold
[pokecrystal]: https://github.com/pret/pokecrystal
[pokepinball]: https://github.com/pret/pokepinball
[poketcg]: https://github.com/pret/poketcg
[pokeruby]: https://github.com/pret/pokeruby
[pokefirered]: https://github.com/pret/pokefirered
[Discord]: https://discord.gg/cJxDDVP
[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
asm/battle_anim_80A9C70.s
+1 -1
View File
@@ -867,7 +867,7 @@ LaunchStatusAnimation: @ 80AA364
strb r4, [r0]
ldr r0, =gAnimBankTarget
strb r4, [r0]
ldr r0, =gUnknown_082C92FC
ldr r0, =gBattleAnims_Statuses
movs r2, 0
bl LaunchBattleAnimation
ldr r0, =task0A_80788BC
asm/battle_anim_80FE840.s
+12 -12
View File
@@ -14567,7 +14567,7 @@ _08105CCC:
lsls r2, 1
adds r0, r2
str r1, [r0]
ldr r0, =gUnknown_08C22610
ldr r0, =gBattleAnimSpritePalette_206
bl LZDecompressWram
movs r4, 0
_08105D00:
@@ -15557,7 +15557,7 @@ _0810653A:
lsls r0, 24
cmp r0, 0
beq _08106578
ldr r1, =gUnknown_08D93960
ldr r1, =gBattleAnimBackgroundTilemap_ScaryFaceContest
b _0810658A
.pool
_08106578:
@@ -15568,7 +15568,7 @@ _08106578:
lsrs r0, 24
cmp r0, 0x1
bne _0810659C
ldr r1, =gUnknown_08D93598
ldr r1, =gBattleAnimBackgroundTilemap_ScaryFacePlayer
_0810658A:
mov r0, sp
movs r2, 0
@@ -15576,7 +15576,7 @@ _0810658A:
b _081065A6
.pool
_0810659C:
ldr r1, =gUnknown_08D9377C
ldr r1, =gBattleAnimBackgroundTilemap_ScaryFaceOpponent
mov r0, sp
movs r2, 0
bl sub_80A6D60
@@ -17067,8 +17067,8 @@ sub_8107144: @ 8107144
.pool
thumb_func_end sub_8107144
thumb_func_start update_fury_cutter_counter_copy
update_fury_cutter_counter_copy: @ 8107168
thumb_func_start sub_8107168
sub_8107168: @ 8107168
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -17081,7 +17081,7 @@ update_fury_cutter_counter_copy: @ 8107168
pop {r0}
bx r0
.pool
thumb_func_end update_fury_cutter_counter_copy
thumb_func_end sub_8107168
thumb_func_start sub_8107188
sub_8107188: @ 8107188
@@ -18097,7 +18097,7 @@ _081079E0:
_081079EA:
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, =gUnknown_08D94AB8
ldr r1, =gBattleAnimBackgroundImage_Surf
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80A6CC0
@@ -18106,7 +18106,7 @@ _081079EA:
ldrsh r0, [r0, r1]
cmp r0, 0
bne _08107A24
ldr r0, =gUnknown_08D95DD8
ldr r0, =gBattleAnimBackgroundPalette_Surf
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@@ -18115,7 +18115,7 @@ _081079EA:
b _08107A32
.pool
_08107A24:
ldr r0, =gUnknown_08D8FB9C
ldr r0, =gBattleAnimBackgroundImageMuddyWater_Pal
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@@ -26969,7 +26969,7 @@ _0810C0E2:
mov r3, sp
ldrh r3, [r3, 0xA]
bl LoadBgTiles
ldr r1, =gUnknown_08D932E0
ldr r1, =gBattleAnimFogTilemap
mov r0, sp
movs r2, 0
bl sub_80A6D60
@@ -27251,7 +27251,7 @@ _0810C366:
mov r3, sp
ldrh r3, [r3, 0xA]
bl LoadBgTiles
ldr r1, =gUnknown_08D932E0
ldr r1, =gBattleAnimFogTilemap
mov r0, sp
movs r2, 0
bl sub_80A6D60
asm/battle_anim_815A0D4.s
+6 -6
View File
@@ -639,8 +639,8 @@ _0815A5AC:
.pool
thumb_func_end sub_815A52C
thumb_func_start c3_80DE6F0
c3_80DE6F0: @ 815A5C8
thumb_func_start sub_815A5C8
sub_815A5C8: @ 815A5C8
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
@@ -656,7 +656,7 @@ c3_80DE6F0: @ 815A5C8
strb r0, [r1]
bx lr
.pool
thumb_func_end c3_80DE6F0
thumb_func_end sub_815A5C8
thumb_func_start sub_815A5F0
sub_815A5F0: @ 815A5F0
@@ -3271,8 +3271,8 @@ _0815BAFC:
.pool
thumb_func_end sub_815B7D0
thumb_func_start c3_80DFBE4
c3_80DFBE4: @ 815BB18
thumb_func_start sub_815BB18
sub_815BB18: @ 815BB18
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -3297,7 +3297,7 @@ c3_80DFBE4: @ 815BB18
pop {r0}
bx r0
.pool
thumb_func_end c3_80DFBE4
thumb_func_end sub_815BB18
thumb_func_start sub_815BB58
sub_815BB58: @ 815BB58
asm/battle_anim_sound_tasks.s
+3 -3
View File
@@ -150,8 +150,8 @@ _08158C4C:
.pool
thumb_func_end sub_8158C04
thumb_func_start mas_80DCF38
mas_80DCF38: @ 8158C58
thumb_func_start sub_8158C58
sub_8158C58: @ 8158C58
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -230,7 +230,7 @@ mas_80DCF38: @ 8158C58
pop {r0}
bx r0
.pool
thumb_func_end mas_80DCF38
thumb_func_end sub_8158C58
thumb_func_start sub_8158D08
sub_8158D08: @ 8158D08
asm/battle_frontier_1.s
+1 -1
View File
@@ -13641,7 +13641,7 @@ sub_8195ED8: @ 8195ED8
push {r4,lr}
ldr r4, =gMapHeader
ldrb r0, [r4, 0x17]
bl is_light_level_1_2_3_or_6
bl Overworld_MapTypeAllowsTeleportAndFly
lsls r0, 24
cmp r0, 0
beq _08195F30
asm/battle_frontier_2.s
+6 -6
View File
@@ -189,7 +189,7 @@ _0819A69C:
bl ResetSpriteData
bl ResetTasks
bl FreeAllSpritePalettes
ldr r0, =gUnknown_08DC0754
ldr r0, =gFrontierFactorySelectMenu_Gfx
ldr r5, =gUnknown_0203CE2C
ldr r1, [r5]
movs r2, 0x88
@@ -211,7 +211,7 @@ _0819A69C:
movs r2, 0x60
movs r3, 0
bl LoadBgTiles
ldr r0, =gUnknown_08DC0B94
ldr r0, =gFrontierFactorySelectMenu_Tilemap
ldr r4, =gUnknown_0203CE34
ldr r1, [r4]
movs r2, 0x80
@@ -223,7 +223,7 @@ _0819A69C:
movs r0, 0x1
movs r3, 0
bl LoadBgTilemap
ldr r0, =gUnknown_08DC0714
ldr r0, =gFrontierFactorySelectMenu_Pal
movs r1, 0
movs r2, 0x40
bl LoadPalette
@@ -6646,7 +6646,7 @@ _0819DDA8:
bl ResetTasks
bl FreeAllSpritePalettes
bl dp13_810BB8C
ldr r0, =gUnknown_08DC0754
ldr r0, =gFrontierFactorySelectMenu_Gfx
ldr r5, =gUnknown_0203CE40
ldr r1, [r5]
movs r2, 0x88
@@ -6668,7 +6668,7 @@ _0819DDA8:
movs r2, 0x60
movs r3, 0
bl LoadBgTiles
ldr r0, =gUnknown_08DC0B94
ldr r0, =gFrontierFactorySelectMenu_Tilemap
ldr r4, =gUnknown_0203CE48
ldr r1, [r4]
movs r2, 0x80
@@ -6680,7 +6680,7 @@ _0819DDA8:
movs r0, 0x1
movs r3, 0
bl LoadBgTilemap
ldr r0, =gUnknown_08DC0714
ldr r0, =gFrontierFactorySelectMenu_Pal
movs r1, 0
movs r2, 0x40
bl LoadPalette
asm/bike.s
-2199
View File
File diff suppressed because it is too large. Load diff
asm/contest.s
+2 -2
View File
@@ -6652,7 +6652,7 @@ sub_80DB0C4: @ 80DB0C4
push {r4,r5,lr}
ldr r0, =gUnknown_08587C00
bl LoadCompressedObjectPic
ldr r0, =gUnknown_08C1C6B8
ldr r0, =gContest2Pal
movs r1, 0x88
lsls r1, 1
movs r2, 0x20
@@ -11731,7 +11731,7 @@ _080DD956:
ldr r1, [r0]
movs r0, 0x13
ldrsb r0, [r1, r0]
ldr r4, =gUnknown_08D8EC24
ldr r4, =gContestApplauseMeterGfx
cmp r5, r0
bge _080DD966
adds r4, 0x40
asm/easy_chat.s
+3 -3
View File
@@ -3966,14 +3966,14 @@ _0811BFE0:
b _0811C124
.pool
_0811C044:
ldr r1, =gUnknown_08DCBDD0
ldr r1, =gEasyChatWindow_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
bl copy_decompressed_tile_data_to_vram_autofree
ldr r1, =gUnknown_08DCBF10
ldr r1, =gEasyChatWindow_Tilemap
movs r0, 0x3
movs r2, 0
movs r3, 0
@@ -5810,7 +5810,7 @@ sub_811CF04: @ 811CF04
sub_811CF64: @ 811CF64
push {r4,lr}
bl ResetPaletteFade
ldr r0, =gUnknown_08DCBDB0
ldr r0, =gEasyChatMode_Pal
movs r1, 0
movs r2, 0x20
bl LoadPalette
asm/field_control_avatar.s
+1 -1
View File
@@ -62,7 +62,7 @@ _0809BF3C:
cmp r6, 0
bne _0809BFA2
_0809BF40:
bl sub_811A138
bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x4
asm/field_effect.s
+6 -6
View File
@@ -2027,7 +2027,7 @@ _080B6A8A:
thumb_func_start mapldr_08084390
mapldr_08084390: @ 80B6AA4
push {r4,lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_black
ldr r0, =c3_080843F8
movs r1, 0
@@ -2113,7 +2113,7 @@ _080B6B58:
thumb_func_start sub_80B6B68
sub_80B6B68: @ 80B6B68
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
bl FreezeMapObjects
@@ -2780,7 +2780,7 @@ _080B709C:
thumb_func_start sub_80B70B4
sub_80B70B4: @ 80B70B4
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
ldr r0, =sub_80B70DC
@@ -3747,7 +3747,7 @@ _080B784C:
thumb_func_start mapldr_080851BC
mapldr_080851BC: @ 80B7868
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
ldr r0, =gFieldCallback
@@ -4458,7 +4458,7 @@ _080B7E40:
thumb_func_start mapldr_080859D4
mapldr_080859D4: @ 80B7E48
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
bl FreezeMapObjects
@@ -4903,7 +4903,7 @@ _080B81E6:
thumb_func_start mapldr_08085D88
mapldr_08085D88: @ 80B8200
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
bl FreezeMapObjects
asm/field_player_avatar.s
+88 -88
View File
@@ -57,7 +57,7 @@ player_step: @ 808A9C0
bne _0808AA26
adds r0, r7, 0
adds r1, r6, 0
bl sub_8119C3C
bl Bike_TryAcroBikeHistoryUpdate
adds r0, r5, 0
mov r1, r8
bl TryInterruptFieldObjectSpecialAnim
@@ -405,7 +405,7 @@ DoForcedMovementInCurrentDirection: @ 808AC58
thumb_func_start ForcedMovement_Slip
ForcedMovement_Slip: @ 808AC8C
push {lr}
ldr r0, =PlayerGoSpeed1
ldr r0, =PlayerGoSpeed2
bl DoForcedMovementInCurrentDirection
lsls r0, 24
lsrs r0, 24
@@ -417,7 +417,7 @@ ForcedMovement_Slip: @ 808AC8C
thumb_func_start ForcedMovement_WalkSouth
ForcedMovement_WalkSouth: @ 808ACA0
push {lr}
ldr r1, =PlayerGoSpeed0
ldr r1, =PlayerGoSpeed1
movs r0, 0x1
bl DoForcedMovement
lsls r0, 24
@@ -430,7 +430,7 @@ ForcedMovement_WalkSouth: @ 808ACA0
thumb_func_start ForcedMovement_WalkNorth
ForcedMovement_WalkNorth: @ 808ACB8
push {lr}
ldr r1, =PlayerGoSpeed0
ldr r1, =PlayerGoSpeed1
movs r0, 0x2
bl DoForcedMovement
lsls r0, 24
@@ -443,7 +443,7 @@ ForcedMovement_WalkNorth: @ 808ACB8
thumb_func_start ForcedMovement_WalkWest
ForcedMovement_WalkWest: @ 808ACD0
push {lr}
ldr r1, =PlayerGoSpeed0
ldr r1, =PlayerGoSpeed1
movs r0, 0x3
bl DoForcedMovement
lsls r0, 24
@@ -456,7 +456,7 @@ ForcedMovement_WalkWest: @ 808ACD0
thumb_func_start ForcedMovement_WalkEast
ForcedMovement_WalkEast: @ 808ACE8
push {lr}
ldr r1, =PlayerGoSpeed0
ldr r1, =PlayerGoSpeed1
movs r0, 0x4
bl DoForcedMovement
lsls r0, 24
@@ -469,7 +469,7 @@ ForcedMovement_WalkEast: @ 808ACE8
thumb_func_start ForcedMovement_PushedSouthByCurrent
ForcedMovement_PushedSouthByCurrent: @ 808AD00
push {lr}
ldr r1, =PlayerGoSpeed2
ldr r1, =PlayerGoSpeed3
movs r0, 0x1
bl DoForcedMovement
lsls r0, 24
@@ -482,7 +482,7 @@ ForcedMovement_PushedSouthByCurrent: @ 808AD00
thumb_func_start ForcedMovement_PushedNorthByCurrent
ForcedMovement_PushedNorthByCurrent: @ 808AD18
push {lr}
ldr r1, =PlayerGoSpeed2
ldr r1, =PlayerGoSpeed3
movs r0, 0x2
bl DoForcedMovement
lsls r0, 24
@@ -495,7 +495,7 @@ ForcedMovement_PushedNorthByCurrent: @ 808AD18
thumb_func_start ForcedMovement_PushedWestByCurrent
ForcedMovement_PushedWestByCurrent: @ 808AD30
push {lr}
ldr r1, =PlayerGoSpeed2
ldr r1, =PlayerGoSpeed3
movs r0, 0x3
bl DoForcedMovement
lsls r0, 24
@@ -508,7 +508,7 @@ ForcedMovement_PushedWestByCurrent: @ 808AD30
thumb_func_start ForcedMovement_PushedEastByCurrent
ForcedMovement_PushedEastByCurrent: @ 808AD48
push {lr}
ldr r1, =PlayerGoSpeed2
ldr r1, =PlayerGoSpeed3
movs r0, 0x4
bl DoForcedMovement
lsls r0, 24
@@ -548,7 +548,7 @@ ForcedMovement_Slide: @ 808AD60
thumb_func_start ForcedMovement_SlideSouth
ForcedMovement_SlideSouth: @ 808AD98
push {lr}
ldr r1, =PlayerGoSpeed1
ldr r1, =PlayerGoSpeed2
movs r0, 0x1
bl ForcedMovement_Slide
lsls r0, 24
@@ -561,7 +561,7 @@ ForcedMovement_SlideSouth: @ 808AD98
thumb_func_start ForcedMovement_SlideNorth
ForcedMovement_SlideNorth: @ 808ADB0
push {lr}
ldr r1, =PlayerGoSpeed1
ldr r1, =PlayerGoSpeed2
movs r0, 0x2
bl ForcedMovement_Slide
lsls r0, 24
@@ -574,7 +574,7 @@ ForcedMovement_SlideNorth: @ 808ADB0
thumb_func_start ForcedMovement_SlideWest
ForcedMovement_SlideWest: @ 808ADC8
push {lr}
ldr r1, =PlayerGoSpeed1
ldr r1, =PlayerGoSpeed2
movs r0, 0x3
bl ForcedMovement_Slide
lsls r0, 24
@@ -587,7 +587,7 @@ ForcedMovement_SlideWest: @ 808ADC8
thumb_func_start ForcedMovement_SlideEast
ForcedMovement_SlideEast: @ 808ADE0
push {lr}
ldr r1, =PlayerGoSpeed1
ldr r1, =PlayerGoSpeed2
movs r0, 0x4
bl ForcedMovement_Slide
lsls r0, 24
@@ -630,19 +630,19 @@ ForcedMovement_MuddySlope: @ 808AE10
ands r0, r1
cmp r0, 0x20
bne _0808AE36
bl sub_811A138
bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x3
bgt _0808AE60
_0808AE36:
movs r0, 0
bl sub_811A114
bl Bike_UpdateBikeCounterSpeed
ldrb r0, [r4, 0x1]
movs r1, 0x2
orrs r0, r1
strb r0, [r4, 0x1]
ldr r1, =PlayerGoSpeed1
ldr r1, =PlayerGoSpeed2
movs r0, 0x1
bl DoForcedMovement
lsls r0, 24
@@ -791,7 +791,7 @@ _0808AF4E:
cmp r0, 0
beq _0808AF68
adds r0, r5, 0
bl PlayerGoSpeed1
bl PlayerGoSpeed2
b _0808AFB6
.pool
_0808AF68:
@@ -829,7 +829,7 @@ _0808AF68:
.pool
_0808AFB0:
adds r0, r5, 0
bl PlayerGoSpeed0
bl PlayerGoSpeed1
_0808AFB6:
pop {r4-r6}
pop {r0}
@@ -1471,7 +1471,7 @@ PlayerAvatarTransition_MachBike: @ 808B46C
bl SetPlayerAvatarStateMask
movs r0, 0
movs r1, 0
bl sub_811A0D0
bl BikeClearState
pop {r4}
pop {r0}
bx r0
@@ -1497,8 +1497,8 @@ PlayerAvatarTransition_AcroBike: @ 808B4A0
bl SetPlayerAvatarStateMask
movs r0, 0
movs r1, 0
bl sub_811A0D0
bl sub_811A188
bl BikeClearState
bl Bike_HandleBumpySlopeJump
pop {r4}
pop {r0}
bx r0
@@ -1774,9 +1774,9 @@ sub_808B6BC: @ 808B6BC
.pool
thumb_func_end sub_808B6BC
thumb_func_start player_npc_set_state_and_x22_etc
@ void player_npc_set_state_and_x22_etc(u8 animState, u8 a2)
player_npc_set_state_and_x22_etc: @ 808B6E4
thumb_func_start PlayerSetAnimId
@ void PlayerSetAnimId(u8 animState, u8 a2)
PlayerSetAnimId: @ 808B6E4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -1802,11 +1802,11 @@ _0808B712:
pop {r0}
bx r0
.pool
thumb_func_end player_npc_set_state_and_x22_etc
thumb_func_end PlayerSetAnimId
thumb_func_start PlayerGoSpeed0
@ void PlayerGoSpeed0(u8 direction)
PlayerGoSpeed0: @ 808B720
thumb_func_start PlayerGoSpeed1
@ void PlayerGoSpeed1(u8 direction)
PlayerGoSpeed1: @ 808B720
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1814,14 +1814,14 @@ PlayerGoSpeed0: @ 808B720
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerGoSpeed0
thumb_func_end PlayerGoSpeed1
thumb_func_start PlayerGoSpeed1
@ void PlayerGoSpeed1(u8 direction)
PlayerGoSpeed1: @ 808B738
thumb_func_start PlayerGoSpeed2
@ void PlayerGoSpeed2(u8 direction)
PlayerGoSpeed2: @ 808B738
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1829,14 +1829,14 @@ PlayerGoSpeed1: @ 808B738
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerGoSpeed1
thumb_func_end PlayerGoSpeed2
thumb_func_start PlayerGoSpeed2
@ void PlayerGoSpeed2(u8 direction)
PlayerGoSpeed2: @ 808B750
thumb_func_start PlayerGoSpeed3
@ void PlayerGoSpeed3(u8 direction)
PlayerGoSpeed3: @ 808B750
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1844,14 +1844,14 @@ PlayerGoSpeed2: @ 808B750
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerGoSpeed2
thumb_func_end PlayerGoSpeed3
thumb_func_start PlayerGoSpeed3
@ void PlayerGoSpeed3(u8 direction)
PlayerGoSpeed3: @ 808B768
thumb_func_start PlayerGoSpeed4
@ void PlayerGoSpeed4(u8 direction)
PlayerGoSpeed4: @ 808B768
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1859,10 +1859,10 @@ PlayerGoSpeed3: @ 808B768
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerGoSpeed3
thumb_func_end PlayerGoSpeed4
thumb_func_start PlayerRun
@ void PlayerRun(u8 direction)
@@ -1874,7 +1874,7 @@ PlayerRun: @ 808B780
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerRun
@@ -1893,7 +1893,7 @@ PlayerOnBikeCollide: @ 808B798
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
@@ -1909,7 +1909,7 @@ PlayerOnBikeCollideWithFarawayIslandMew: @ 808B7BC
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerOnBikeCollideWithFarawayIslandMew
@@ -1928,7 +1928,7 @@ PlayerNotOnBikeCollide: @ 808B7D4
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
@@ -1944,7 +1944,7 @@ PlayerNotOnBikeCollideWithFarawayIslandMew: @ 808B7F8
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerNotOnBikeCollideWithFarawayIslandMew
@@ -1959,7 +1959,7 @@ PlayerFaceDirection: @ 808B810
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerFaceDirection
@@ -1974,7 +1974,7 @@ PlayerTurnInPlace: @ 808B828
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerTurnInPlace
@@ -1993,7 +1993,7 @@ PlayerJumpLedge: @ 808B840
lsls r0, 24
lsrs r0, 24
movs r1, 0x8
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
@@ -2033,8 +2033,8 @@ _0808B89A:
.pool
thumb_func_end sub_808B864
thumb_func_start sub_808B8A8
sub_808B8A8: @ 808B8A8
thumb_func_start PlayerIdleWheelie
PlayerIdleWheelie: @ 808B8A8
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2042,13 +2042,13 @@ sub_808B8A8: @ 808B8A8
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end sub_808B8A8
thumb_func_end PlayerIdleWheelie
thumb_func_start sub_808B8C0
sub_808B8C0: @ 808B8C0
thumb_func_start PlayerStartWheelie
PlayerStartWheelie: @ 808B8C0
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2056,13 +2056,13 @@ sub_808B8C0: @ 808B8C0
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end sub_808B8C0
thumb_func_end PlayerStartWheelie
thumb_func_start sub_808B8D8
sub_808B8D8: @ 808B8D8
thumb_func_start PlayerEndWheelie
PlayerEndWheelie: @ 808B8D8
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2070,13 +2070,13 @@ sub_808B8D8: @ 808B8D8
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end sub_808B8D8
thumb_func_end PlayerEndWheelie
thumb_func_start sub_808B8F0
sub_808B8F0: @ 808B8F0
thumb_func_start PlayerStandingHoppingWheelie
PlayerStandingHoppingWheelie: @ 808B8F0
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2088,14 +2088,14 @@ sub_808B8F0: @ 808B8F0
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_808B8F0
thumb_func_end PlayerStandingHoppingWheelie
thumb_func_start sub_808B914
sub_808B914: @ 808B914
thumb_func_start PlayerMovingHoppingWheelie
PlayerMovingHoppingWheelie: @ 808B914
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2107,14 +2107,14 @@ sub_808B914: @ 808B914
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_808B914
thumb_func_end PlayerMovingHoppingWheelie
thumb_func_start sub_808B938
sub_808B938: @ 808B938
thumb_func_start PlayerLedgeHoppingWheelie
PlayerLedgeHoppingWheelie: @ 808B938
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2126,14 +2126,14 @@ sub_808B938: @ 808B938
lsls r0, 24
lsrs r0, 24
movs r1, 0x8
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_808B938
thumb_func_end PlayerLedgeHoppingWheelie
thumb_func_start sub_808B95C
sub_808B95C: @ 808B95C
thumb_func_start PlayerAcroTurnJump
PlayerAcroTurnJump: @ 808B95C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2145,11 +2145,11 @@ sub_808B95C: @ 808B95C
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_808B95C
thumb_func_end PlayerAcroTurnJump
thumb_func_start sub_808B980
sub_808B980: @ 808B980
@@ -2164,7 +2164,7 @@ sub_808B980: @ 808B980
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
@@ -2179,7 +2179,7 @@ sub_808B9A4: @ 808B9A4
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end sub_808B9A4
@@ -2193,7 +2193,7 @@ sub_808B9BC: @ 808B9BC
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end sub_808B9BC
@@ -2207,7 +2207,7 @@ npc_use_some_d2s: @ 808B9D4
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end npc_use_some_d2s
@@ -2592,9 +2592,9 @@ sub_808BCF4: @ 808BCF4
lsls r0, 24
cmp r0, 0
beq _0808BD2C
bl sub_811A188
bl Bike_HandleBumpySlopeJump
movs r0, 0
bl sub_811A114
bl Bike_UpdateBikeCounterSpeed
_0808BD2C:
pop {r4}
pop {r0}
asm/field_screen.s
+10 -10
View File
@@ -7975,7 +7975,7 @@ _080AF120:
sub_80AF128: @ 80AF128
push {lr}
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_black
ldr r0, =task0A_nop_for_a_while
movs r1, 0xA
@@ -8006,7 +8006,7 @@ _080AF160:
sub_80AF168: @ 80AF168
push {lr}
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_black
ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running
movs r1, 0xA
@@ -8092,7 +8092,7 @@ _080AF20E:
sub_80AF214: @ 80AF214
push {lr}
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl palette_bg_faded_fill_black
ldr r0, =task_mpl_807DD60
movs r1, 0xA
@@ -8220,7 +8220,7 @@ _080AF30C:
sub_80AF314: @ 80AF314
push {lr}
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl palette_bg_faded_fill_black
ldr r0, =sub_80AF234
movs r1, 0xA
@@ -8279,7 +8279,7 @@ _080AF37E:
thumb_func_start mapldr_default
mapldr_default: @ 80AF398
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl sub_80AF334
bl ScriptContext2_Enable
@@ -8290,7 +8290,7 @@ mapldr_default: @ 80AF398
thumb_func_start sub_80AF3B0
sub_80AF3B0: @ 80AF3B0
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl sub_80AF08C
bl sub_80AF334
bl ScriptContext2_Enable
@@ -8304,7 +8304,7 @@ sub_80AF3C8: @ 80AF3C8
bl sub_81D6534
cmp r0, 0
bne _080AF3D6
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
_080AF3D6:
bl pal_fill_black
bl sub_80AF334
@@ -8316,7 +8316,7 @@ _080AF3D6:
thumb_func_start sub_80AF3E8
sub_80AF3E8: @ 80AF3E8
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
movs r0, 0x2E
bl PlaySE
@@ -8332,7 +8332,7 @@ sub_80AF3E8: @ 80AF3E8
thumb_func_start sub_80AF40C
sub_80AF40C: @ 80AF40C
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
movs r0, 0x2E
bl PlaySE
@@ -8680,7 +8680,7 @@ sub_80AF6D4: @ 80AF6D4
sub_80AF6F0: @ 80AF6F0
push {lr}
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_black
ldr r0, =task_mpl_807E3C8
movs r1, 0xA
asm/field_specials.s
+5 -5
View File
@@ -32,10 +32,10 @@ Special_ViewWallClock: @ 8137CC8
thumb_func_start ResetCyclingRoadChallengeData
ResetCyclingRoadChallengeData: @ 8137CEC
ldr r0, =gUnknown_0203AB54
ldr r0, =gBikeCyclingChallenge
movs r1, 0
strb r1, [r0]
ldr r0, =gUnknown_0203AB55
ldr r0, =0x0203ab55
strb r1, [r0]
ldr r1, =gUnknown_0203AB58
movs r0, 0
@@ -46,10 +46,10 @@ ResetCyclingRoadChallengeData: @ 8137CEC
thumb_func_start Special_BeginCyclingRoadChallenge
Special_BeginCyclingRoadChallenge: @ 8137D0C
ldr r1, =gUnknown_0203AB54
ldr r1, =gBikeCyclingChallenge
movs r0, 0x1
strb r0, [r1]
ldr r1, =gUnknown_0203AB55
ldr r1, =0x0203ab55
movs r0, 0
strb r0, [r1]
ldr r1, =gUnknown_0203AB58
@@ -218,7 +218,7 @@ FinishCyclingRoadChallenge: @ 8137E6C
ldr r4, [r0, 0x20]
ldr r0, [r1]
subs r4, r0
ldr r5, =gUnknown_0203AB55
ldr r5, =0x0203ab55
ldrb r1, [r5]
adds r0, r4, 0
bl DetermineCyclingRoadResults
asm/field_tasks.s
+1 -1
View File
@@ -1662,7 +1662,7 @@ _0809E572:
lsls r0, 24
cmp r0, 0
beq _0809E5D2
bl sub_811A138
bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x4
asm/fldeff_80F9BCC.s
+3 -3
View File
@@ -591,7 +591,7 @@ sub_80FA004: @ 80FA004
bne _080FA070
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_80FA0DC
@@ -606,7 +606,7 @@ _080FA070:
bne _080FA0A0
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_80FA1E8
@@ -625,7 +625,7 @@ _080FA0AE:
_080FA0B2:
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_80FA34C
asm/fldeff_cut.s
+3 -3
View File
@@ -20,7 +20,7 @@ sub_80D3718: @ 80D3718
cmp r0, 0x1
bne _080D3754
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_80D3A9C
@@ -322,7 +322,7 @@ _080D395A:
bne _080D39F8
_080D39BC:
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm2_ruin_valley
@@ -360,7 +360,7 @@ _080D3A18:
bne _080D3A2A
_080D3A1E:
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm2_ruin_valley
asm/fldeff_flash.s
+2 -2
View File
@@ -18,7 +18,7 @@ SetUpFieldMove_Flash: @ 81370FC
lsrs r0, 24
strh r0, [r4]
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_8179918
@@ -35,7 +35,7 @@ _08137134:
cmp r0, 0
bne _08137170
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm2_flash
asm/fldeff_strength.s
+1 -1
View File
@@ -23,7 +23,7 @@ _08145DD8:
lsrs r0, 24
strh r0, [r4]
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_8145E0C
asm/fldeff_sweetscent.s
+1 -1
View File
@@ -8,7 +8,7 @@
thumb_func_start SetUpFieldMove_SweetScent
SetUpFieldMove_SweetScent: @ 8159EF0
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm2_sweet_scent
asm/fldeff_teleport.s
-84
View File
@@ -1,84 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start SetUpFieldMove_Teleport
SetUpFieldMove_Teleport: @ 817C8BC
push {lr}
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
bl is_light_level_1_2_3_or_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0817C8D8
movs r0, 0
b _0817C8E6
.pool
_0817C8D8:
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm_teleport_run_dp02scr
str r0, [r1]
movs r0, 0x1
_0817C8E6:
pop {r1}
bx r1
.pool
thumb_func_end SetUpFieldMove_Teleport
thumb_func_start hm_teleport_run_dp02scr
hm_teleport_run_dp02scr: @ 817C8FC
push {lr}
bl sub_808469C
movs r0, 0x3F
bl FieldEffectStart
bl GetCursorSelectionMonId
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.pool
thumb_func_end hm_teleport_run_dp02scr
thumb_func_start FldEff_UseTeleport
FldEff_UseTeleport: @ 817C91C
push {lr}
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, =sub_817C94C
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0x1
bl SetPlayerAvatarTransitionFlags
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end FldEff_UseTeleport
thumb_func_start sub_817C94C
sub_817C94C: @ 817C94C
push {lr}
movs r0, 0x3F
bl FieldEffectActiveListRemove
bl sub_80B7FC8
pop {r0}
bx r0
thumb_func_end sub_817C94C
.align 2, 0 @ Don't pad with nop.
asm/hof_pc.s
+1 -1
View File
@@ -34,7 +34,7 @@ ReshowPCMenuAfterHallOfFamePC: @ 8137C5C
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl sp109_CreatePCMenu
bl sub_80E2514
movs r0, 0x1
asm/intro.s
+29 -29
View File
@@ -1945,24 +1945,24 @@ task_intro_13: @ 816DD28
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
ldr r0, =gUnknown_08D88494
ldr r0, =gIntro3GroudonGfx
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
ldr r0, =gUnknown_08D88D40
ldr r0, =gIntro3GroudonTilemap
ldr r1, =0x0600c000
bl LZDecompressVram
ldr r0, =gUnknown_08D89F7C
ldr r0, =gIntro3LegendBgGfx
ldr r1, =0x06004000
bl LZDecompressVram
ldr r0, =gUnknown_08D8A818
ldr r0, =gIntro3GroudonBgTilemap
ldr r1, =0x0600e000
bl LZDecompressVram
ldr r0, =gBattleAnimPicTable + 0x1D0
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gBattleAnimPaletteTable + 0x1D0
bl LoadCompressedObjectPaletteUsingHeap
ldr r0, =gUnknown_08D85CD0
ldr r0, =gIntro3BgPal
ldr r1, =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 1
@@ -2229,7 +2229,7 @@ _0816DFF4:
strh r0, [r4, 0xC]
movs r1, 0xE
ldrsh r0, [r4, r1]
ldr r1, =gUnknown_08D85CD0
ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0x3E
movs r2, 0x1
@@ -2271,7 +2271,7 @@ _0816E046:
strh r0, [r4, 0xC]
movs r2, 0xE
ldrsh r0, [r4, r2]
ldr r1, =gUnknown_08D85CD0
ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0x3E
movs r2, 0x1
@@ -2571,14 +2571,14 @@ task_intro_19: @ 816E2A0
lsls r4, 24
lsrs r4, 24
bl ResetSpriteData
ldr r0, =gUnknown_08D89224
ldr r0, =gIntro3KyogreGfx
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
ldr r0, =gUnknown_08D89ABC
ldr r0, =gIntro3KyogreTilemap
ldr r1, =0x0600c000
bl LZDecompressVram
ldr r0, =gUnknown_08D8A934
ldr r0, =gIntro3KyogreBgTilemap
ldr r1, =0x0600e000
bl LZDecompressVram
ldr r0, =gUnknown_085E4C88
@@ -2888,7 +2888,7 @@ _0816E56E:
strh r0, [r5, 0xC]
movs r2, 0xE
ldrsh r0, [r5, r2]
ldr r1, =gUnknown_08D85CD0
ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0x5E
movs r2, 0x1
@@ -2932,7 +2932,7 @@ _0816E5BC:
strh r0, [r5, 0xC]
movs r2, 0xE
ldrsh r0, [r5, r2]
ldr r1, =gUnknown_08D85CD0
ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0x5E
movs r2, 0x1
@@ -3319,7 +3319,7 @@ task_intro_21: @ 816E888
movs r0, 0x1A
movs r1, 0
bl SetGpuReg
ldr r4, =gUnknown_08D8AA54
ldr r4, =gIntro3CloudsGfx
movs r1, 0xC0
lsls r1, 19
adds r0, r4, 0
@@ -3327,7 +3327,7 @@ task_intro_21: @ 816E888
ldr r1, =0x06004000
adds r0, r4, 0
bl LZDecompressVram
ldr r0, =gUnknown_08D8B6E8
ldr r0, =gIntro3Clouds3Tilemap
ldr r1, =0x0600e000
bl LZDecompressVram
ldr r1, =gTasks
@@ -3349,10 +3349,10 @@ task_intro_22: @ 816E954
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_08D8B180
ldr r0, =gIntro3Clouds1Tilemap
ldr r1, =0x0600c000
bl LZDecompressVram
ldr r0, =gUnknown_08D8B440
ldr r0, =gIntro3Clouds2Tilemap
ldr r1, =0x0600d000
bl LZDecompressVram
ldr r1, =gTasks
@@ -3509,16 +3509,16 @@ task_intro_25: @ 816EAB8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_08D8C16C
ldr r0, =gIntro3RayquazaTilemap
ldr r1, =0x0600e000
bl LZDecompressVram
ldr r0, =gUnknown_08D8CCC8
ldr r0, =gIntro3Clouds4Tilemap
ldr r1, =0x0600c000
bl LZDecompressVram
ldr r0, =gUnknown_08D8BA74
ldr r0, =gIntro3RayquazaGfx
ldr r1, =0x06004000
bl LZDecompressVram
ldr r0, =gUnknown_08D8C838
ldr r0, =gIntro3Clouds2Gfx
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
@@ -3725,7 +3725,7 @@ _0816ECA0:
_0816ECAC:
movs r1, 0x30
ldrsh r0, [r4, r1]
ldr r1, =gUnknown_08D85CD0
ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0xBA
movs r2, 0x1
@@ -3757,7 +3757,7 @@ _0816ECDC:
strh r0, [r4, 0x32]
movs r1, 0x30
ldrsh r0, [r4, r1]
ldr r1, =gUnknown_08D85CD0
ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0xBA
movs r2, 0x1
@@ -4007,7 +4007,7 @@ _0816EEF4:
movs r2, 0x2
ldrsh r0, [r5, r2]
lsls r0, 1
ldr r1, =gUnknown_08D85E72
ldr r1, =gIntro3BgPal + 0x1A2
adds r0, r1
ldr r1, =gPlttBufferFaded + 0xBC
movs r2, 0x1
@@ -4043,7 +4043,7 @@ _0816EF34:
movs r1, 0x2
ldrsh r0, [r5, r1]
lsls r0, 1
ldr r1, =gUnknown_08D85E72
ldr r1, =gIntro3BgPal + 0x1A2
adds r0, r1
ldr r1, =gPlttBufferFaded + 0xB0
movs r2, 0x1
@@ -4080,7 +4080,7 @@ _0816EF80:
movs r1, 0x2
ldrsh r0, [r5, r1]
lsls r0, 1
ldr r1, =gUnknown_08D85E52
ldr r1, =gIntro3BgPal + 0x182
adds r0, r1
ldr r1, =gPlttBufferFaded + 0xB8
movs r2, 0x1
@@ -4148,7 +4148,7 @@ _0816F00A:
movs r0, 0x50
movs r1, 0x10
bl BlendPalette
ldr r4, =gUnknown_08D85E7C
ldr r4, =gIntro3BgPal + 0x1AC
ldr r5, =gPlttBufferFaded + 0xBC
adds r0, r4, 0
adds r1, r5, 0
@@ -5617,7 +5617,7 @@ _0816FBB4:
cmp r0, 0
beq _0816FC14
lsls r0, 1
ldr r4, =gUnknown_08D85C50
ldr r4, =gIntro1GameFreakTextFadePal
adds r0, r4
ldr r5, =gPlttBufferFaded + 0x23E
adds r1, r5, 0
@@ -5651,7 +5651,7 @@ _0816FC14:
movs r1, 0x30
ldrsh r0, [r6, r1]
lsls r0, 1
ldr r4, =gUnknown_08D85C50
ldr r4, =gIntro1GameFreakTextFadePal
adds r0, r4
ldr r5, =gPlttBufferFaded + 0x23E
adds r1, r5, 0
@@ -5696,7 +5696,7 @@ _0816FC6C:
cmp r0, 0x9
bgt _0816FCE6
lsls r0, 1
ldr r4, =gUnknown_08D85C50
ldr r4, =gIntro1GameFreakTextFadePal
adds r0, r4
ldr r5, =gPlttBufferFaded + 0x23E
adds r1, r5, 0
asm/item_menu.s
+4 -4
View File
@@ -637,7 +637,7 @@ _081AB0E8:
.4byte _081AB1A8
_081AB0FC:
bl reset_temp_tile_data_buffers
ldr r1, =gUnknown_08D9A620
ldr r1, =gBagScreen_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x2
@@ -670,14 +670,14 @@ _081AB13C:
ldrb r0, [r0, 0x8]
cmp r0, 0
beq _081AB164
ldr r0, =gUnknown_08D9A5D4
ldr r0, =gBagScreenFemale_Pal
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
b _081AB1AE
.pool
_081AB164:
ldr r0, =gUnknown_08D9A588
ldr r0, =gBagScreenMale_Pal
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
@@ -1164,7 +1164,7 @@ _081AB570:
lsrs r0, 16
cmp r0, 0x7
bhi _081AB5BE
ldr r1, =gUnknown_08DC6378
ldr r1, =gBagMenuHMIcon_Gfx
subs r3, r7, 0x1
lsls r3, 16
lsrs r3, 16
asm/item_use.s
+1 -1
View File
@@ -354,7 +354,7 @@ _080FD320:
bl sav1_map_is_biking_allowed
cmp r0, 0x1
bne _080FD348
bl sub_8119FF8
bl IsBikingDisallowedByPlayer
lsls r0, 24
cmp r0, 0
bne _080FD348
asm/link.s
+3 -3
View File
@@ -44695,11 +44695,11 @@ sub_80205B4: @ 80205B4
task_tutorial_story_unknown: @ 8020604
push {r4,r5,lr}
sub sp, 0x4
ldr r0, =gUnknown_08DD4860
ldr r0, =gLinkMiscMenu_Pal
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r1, =gUnknown_08DD4880
ldr r1, =gLinkMiscMenu_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x2
@@ -44727,7 +44727,7 @@ task_tutorial_story_unknown: @ 8020604
movs r2, 0x8
bl CpuFastSet
_0802064E:
ldr r1, =gUnknown_08DD4AB8
ldr r1, =gLinkMiscMenu_Tilemap
movs r0, 0x2
movs r2, 0
movs r3, 0
asm/macros/battle_ai_script.inc
+619
View File
@@ -0,0 +1,619 @@
.macro if_random_less_than param0, param1
.byte 0x0
.byte \param0
.4byte \param1
.endm
.macro if_random_greater_than param0, param1
.byte 0x1
.byte \param0
.4byte \param1
.endm
.macro if_random_equal param0, param1
.byte 0x2
.byte \param0
.4byte \param1
.endm
.macro if_random_not_equal param0, param1
.byte 0x3
.byte \param0
.4byte \param1
.endm
.macro score param0
.byte 0x4
.byte \param0
.endm
.macro if_hp_less_than bank, param1, param2
.byte 0x5
.byte \bank
.byte \param1
.4byte \param2
.endm
.macro if_hp_more_than bank, param1, param2
.byte 0x6
.byte \bank
.byte \param1
.4byte \param2
.endm
.macro if_hp_equal bank, param1, param2
.byte 0x7
.byte \bank
.byte \param1
.4byte \param2
.endm
.macro if_hp_not_equal bank, param1, param2
.byte 0x8
.byte \bank
.byte \param1
.4byte \param2
.endm
.macro if_status bank, status1, param2
.byte 0x9
.byte \bank
.4byte \status1
.4byte \param2
.endm
.macro if_not_status bank, status1, param2
.byte 0xa
.byte \bank
.4byte \status1
.4byte \param2
.endm
.macro if_status2 bank, status2, param2
.byte 0xb
.byte \bank
.4byte \status2
.4byte \param2
.endm
.macro if_not_status2 bank, status2, param2
.byte 0xc
.byte \bank
.4byte \status2
.4byte \param2
.endm
.macro if_status3 bank, status3, param2
.byte 0xd
.byte \bank
.4byte \status3
.4byte \param2
.endm
.macro if_not_status3 bank, status3, param2
.byte 0xe
.byte \bank
.4byte \status3
.4byte \param2
.endm
.macro if_side_affecting bank, sidestatus, param2
.byte 0xf
.byte \bank
.4byte \sidestatus
.4byte \param2
.endm
.macro if_not_side_affecting bank, sidestatus, param2
.byte 0x10
.byte \bank
.4byte \sidestatus
.4byte \param2
.endm
.macro if_less_than param0, param1
.byte 0x11
.byte \param0
.4byte \param1
.endm
.macro if_more_than param0, param1
.byte 0x12
.byte \param0
.4byte \param1
.endm
.macro if_equal param0, param1
.byte 0x13
.byte \param0
.4byte \param1
.endm
.macro if_not_equal param0, param1
.byte 0x14
.byte \param0
.4byte \param1
.endm
.macro if_less_than_ptr param0, param1
.byte 0x15
.4byte \param0
.4byte \param1
.endm
.macro if_more_than_ptr param0, param1
.byte 0x16
.4byte \param0
.4byte \param1
.endm
.macro if_equal_ptr param0, param1
.byte 0x17
.4byte \param0
.4byte \param1
.endm
.macro if_not_equal_ptr param0, param1
.byte 0x18
.4byte \param0
.4byte \param1
.endm
.macro if_move param0, param1
.byte 0x19
.2byte \param0
.4byte \param1
.endm
.macro if_not_move param0, param1
.byte 0x1a
.2byte \param0
.4byte \param1
.endm
.macro if_in_bytes param0, param1
.byte 0x1b
.4byte \param0
.4byte \param1
.endm
.macro if_not_in_bytes param0, param1
.byte 0x1c
.4byte \param0
.4byte \param1
.endm
.macro if_in_hwords param0, param1
.byte 0x1d
.4byte \param0
.4byte \param1
.endm
.macro if_not_in_hwords param0, param1
.byte 0x1e
.4byte \param0
.4byte \param1
.endm
.macro if_user_has_attacking_move param0
.byte 0x1f
.4byte \param0
.endm
.macro if_user_has_no_attacking_moves param0
.byte 0x20
.4byte \param0
.endm
.macro get_turn_count
.byte 0x21
.endm
.macro get_type param0
.byte 0x22
.byte \param0
.endm
.macro get_considered_move_power
.byte 0x23
.endm
.macro get_how_powerful_move_is
.byte 0x24
.endm
.macro get_last_used_bank_move bank
.byte 0x25
.byte \bank
.endm
.macro if_equal_ param0, param1
.byte 0x26
.byte \param0
.4byte \param1
.endm
.macro if_not_equal_ param0, param1
.byte 0x27
.byte \param0
.4byte \param1
.endm
.macro if_user_goes param0, param1
.byte 0x28
.byte \param0
.4byte \param1
.endm
.macro if_user_doesnt_go param0, param1
.byte 0x29
.byte \param0
.4byte \param1
.endm
.macro nullsub_2A
.byte 0x2a
.endm
.macro nullsub_2B
.byte 0x2b
.endm
.macro count_usable_party_mons bank
.byte 0x2c
.byte \bank
.endm
.macro get_considered_move
.byte 0x2d
.endm
.macro get_considered_move_effect
.byte 0x2e
.endm
.macro get_ability bank
.byte 0x2f
.byte \bank
.endm
.macro get_highest_type_effectiveness
.byte 0x30
.endm
.macro if_type_effectiveness param0, param1
.byte 0x31
.byte \param0
.4byte \param1
.endm
.macro nullsub_32
.byte 0x32
.endm
.macro nullsub_33
.byte 0x33
.endm
.macro if_status_in_party bank, status1, param2
.byte 0x34
.byte \bank
.4byte \status1
.4byte \param2
.endm
.macro if_status_not_in_party bank, status1, param2
.byte 0x35
.byte \bank
.4byte \status1
.4byte \param2
.endm
.macro get_weather
.byte 0x36
.endm
.macro if_effect param0, param1
.byte 0x37
.byte \param0
.4byte \param1
.endm
.macro if_not_effect param0, param1
.byte 0x38
.byte \param0
.4byte \param1
.endm
.macro if_stat_level_less_than bank, stat, param2, param3
.byte 0x39
.byte \bank
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_more_than bank, stat, param2, param3
.byte 0x3a
.byte \bank
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_equal bank, stat, param2, param3
.byte 0x3b
.byte \bank
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_not_equal bank, stat, param2, param3
.byte 0x3c
.byte \bank
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_can_faint param0
.byte 0x3d
.4byte \param0
.endm
.macro if_cant_faint param0
.byte 0x3e
.4byte \param0
.endm
.macro if_has_move bank, param1, param2
.byte 0x3f
.byte \bank
.2byte \param1
.4byte \param2
.endm
.macro if_doesnt_have_move bank, param1, param2
.byte 0x40
.byte \bank
.2byte \param1
.4byte \param2
.endm
.macro if_has_move_with_effect bank, param1, param2
.byte 0x41
.byte \bank
.byte \param1
.4byte \param2
.endm
.macro if_doesnt_have_move_with_effect bank, param1, param2
.byte 0x42
.byte \bank
.byte \param1
.4byte \param2
.endm
.macro if_any_move_disabled_or_encored bank, param1, param2
.byte 0x43
.byte \bank
.byte \param1
.4byte \param2
.endm
.macro if_curr_move_disabled_or_encored param0, param1
.byte 0x44
.byte \param0
.4byte \param1
.endm
.macro flee
.byte 0x45
.endm
.macro if_random_safari_flee param0
.byte 0x46
.4byte \param0
.endm
.macro watch
.byte 0x47
.endm
.macro get_hold_effect bank
.byte 0x48
.byte \bank
.endm
.macro get_gender bank
.byte 0x49
.byte \bank
.endm
.macro is_first_turn_for bank
.byte 0x4a
.byte \bank
.endm
.macro get_stockpile_count bank
.byte 0x4b
.byte \bank
.endm
.macro is_double_battle
.byte 0x4c
.endm
.macro get_used_held_item bank
.byte 0x4d
.byte \bank
.endm
.macro get_move_type_from_result
.byte 0x4e
.endm
.macro get_move_power_from_result
.byte 0x4f
.endm
.macro get_move_effect_from_result
.byte 0x50
.endm
.macro get_protect_count bank
.byte 0x51
.byte \bank
.endm
.macro nullsub_52
.byte 0x52
.endm
.macro nullsub_53
.byte 0x53
.endm
.macro nullsub_54
.byte 0x54
.endm
.macro nullsub_55
.byte 0x55
.endm
.macro nullsub_56
.byte 0x56
.endm
.macro nullsub_57
.byte 0x57
.endm
.macro call param0
.byte 0x58
.4byte \param0
.endm
.macro goto param0
.byte 0x59
.4byte \param0
.endm
.macro end
.byte 0x5a
.endm
.macro if_level_cond param0, param1
.byte 0x5b
.byte \param0
.4byte \param1
.endm
.macro if_target_taunted param0
.byte 0x5c
.4byte \param0
.endm
.macro if_target_not_taunted param0
.byte 0x5d
.4byte \param0
.endm
.macro if_target_is_ally param0
.byte 0x5e
.4byte \param0
.endm
.macro is_of_type bank, type
.byte 0x5f
.byte \bank
.byte \type
.endm
.macro check_ability bank, ability
.byte 0x60
.byte \bank
.byte \ability
.endm
.macro if_flash_fired bank, param1
.byte 0x61
.byte \bank
.4byte \param1
.endm
.macro if_holds_item bank, param1, param2
.byte 0x62
.byte \bank
.2byte \param1
.4byte \param2
.endm
@ useful script macros
.macro get_curr_move_type
get_type AI_TYPE_MOVE
.endm
.macro get_user_type1
get_type AI_TYPE1_USER
.endm
.macro get_user_type2
get_type AI_TYPE2_USER
.endm
.macro get_target_type1
get_type AI_TYPE1_TARGET
.endm
.macro get_target_type2
get_type AI_TYPE2_TARGET
.endm
.macro if_ability bank, ability, ptr
check_ability \bank, \ability
if_equal 1, \ptr
.endm
.macro if_no_ability bank, ability, ptr
check_ability \bank, \ability
if_equal 0, \ptr
.endm
.macro if_type bank, type, ptr
is_of_type \bank, \type
if_equal 1, \ptr
.endm
.macro if_no_type bank, type, ptr
is_of_type \bank, \type
if_equal 0, \ptr
.endm
.macro if_target_faster ptr
if_user_goes 1, \ptr
.endm
.macro if_user_faster ptr
if_user_goes 0, \ptr
.endm
.macro if_double_battle ptr
is_double_battle
if_equal 1, \ptr
.endm
.macro if_not_double_battle ptr
is_double_battle
if_equal 0, \ptr
.endm
.macro if_any_move_disabled bank, ptr
if_any_move_disabled_or_encored \bank, 0, \ptr
.endm
.macro if_any_move_encored bank, ptr
if_any_move_disabled_or_encored \bank, 1, \ptr
.endm
asm/macros/battle_anim_script.inc
+268
View File
@@ -0,0 +1,268 @@
@ commands
.macro loadspritegfx param0
.byte 0x0
.2byte \param0
.endm
.macro unloadspritegfx param0
.byte 0x1
.2byte \param0
.endm
.macro createsprite template, priority, argv:vararg
.byte 0x02
.4byte \template
.byte \priority
.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
.Lsprite_\@_1:
.2byte \argv
.Lsprite_\@_2:
.endm
.macro createvisualtask addr, priority, argv:vararg
.byte 0x03
.4byte \addr
.byte \priority
.byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2
.Lcreatetask_\@_1:
.2byte \argv
.Lcreatetask_\@_2:
.endm
.macro delay param0
.byte 0x4
.byte \param0
.endm
.macro waitforvisualfinish
.byte 0x5
.endm
.macro hang1
.byte 0x6
.endm
.macro hang2
.byte 0x7
.endm
.macro end
.byte 0x8
.endm
.macro playse param0
.byte 0x9
.2byte \param0
.endm
.macro monbg bank
.byte 0xa
.byte \bank
.endm
.macro clearmonbg bank
.byte 0xb
.byte \bank
.endm
.macro setalpha param0
.byte 0xc
.2byte \param0
.endm
.macro blendoff
.byte 0xd
.endm
.macro call param0
.byte 0xe
.4byte \param0
.endm
.macro return
.byte 0xf
.endm
.macro setarg param0, param1
.byte 0x10
.byte \param0
.2byte \param1
.endm
.macro choosetwoturnanim param0, param1
.byte 0x11
.4byte \param0
.4byte \param1
.endm
.macro jumpifmoveturn param0, param1
.byte 0x12
.byte \param0
.4byte \param1
.endm
.macro goto param0
.byte 0x13
.4byte \param0
.endm
.macro fadetobg param0
.byte 0x14
.byte \param0
.endm
.macro restorebg
.byte 0x15
.endm
.macro waitbgfadeout
.byte 0x16
.endm
.macro waitbgfadein
.byte 0x17
.endm
.macro changebg param0
.byte 0x18
.byte \param0
.endm
.macro playsewithpan param0, param1
.byte 0x19
.2byte \param0
.byte \param1
.endm
.macro setpan param0
.byte 0x1a
.byte \param0
.endm
.macro panse_1B param0, param1, param2, param3, param4
.byte 0x1b
.2byte \param0
.byte \param1
.byte \param2
.byte \param3
.byte \param4
.endm
.macro loopsewithpan param0, param1, param2, param3
.byte 0x1c
.2byte \param0
.byte \param1
.byte \param2
.byte \param3
.endm
.macro waitplaysewithpan param0, param1, param2
.byte 0x1d
.2byte \param0
.byte \param1
.byte \param2
.endm
.macro setbldcnt param0
.byte 0x1e
.2byte \param0
.endm
.macro createsoundtask addr, argv:vararg
.byte 0x1F
.4byte \addr
.byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2
.Lcreatetask_1F_\@_1:
.2byte \argv
.Lcreatetask_1F_\@_2:
.endm
.macro waitsound
.byte 0x20
.endm
.macro jumpargeq param0, param1, param2
.byte 0x21
.byte \param0
.2byte \param1
.4byte \param2
.endm
.macro monbg_22 bank
.byte 0x22
.byte \bank
.endm
.macro clearmonbg_23 bank
.byte 0x23
.byte \bank
.endm
.macro jumpifcontest param0
.byte 0x24
.4byte \param0
.endm
.macro fadetobgfromset param0, param1, param2
.byte 0x25
.byte \param0
.byte \param1
.byte \param2
.endm
.macro panse_26 param0, param1, param2, param3, param4
.byte 0x26
.2byte \param0
.byte \param1
.byte \param2
.byte \param3
.byte \param4
.endm
.macro panse_27 param0, param1, param2, param3, param4
.byte 0x27
.2byte \param0
.byte \param1
.byte \param2
.byte \param3
.byte \param4
.endm
.macro monbgprio_28 bank
.byte 0x28
.byte \bank
.endm
.macro monbgprio_29
.byte 0x29
.endm
.macro monbgprio_2A bank
.byte 0x2a
.byte \bank
.endm
.macro invisible bank
.byte 0x2b
.byte \bank
.endm
.macro visible bank
.byte 0x2c
.byte \bank
.endm
.macro doublebattle_2D bank
.byte 0x2d
.byte \bank
.endm
.macro doublebattle_2E bank
.byte 0x2e
.byte \bank
.endm
.macro stopsound
.byte 0x2f
.endm
asm/menu.s
+4 -4
View File
@@ -5257,15 +5257,15 @@ sub_819A2BC: @ 819A2BC
cmp r1, 0x2
beq _0819A2E4
_0819A2D2:
ldr r0, =gUnknown_08DC4318
ldr r0, =gFireRedMenuElements1_Pal
b _0819A2E6
.pool
_0819A2DC:
ldr r0, =gUnknown_08DC4338
ldr r0, =gFireRedMenuElements2_Pal
b _0819A2E6
.pool
_0819A2E4:
ldr r0, =gUnknown_08DC4358
ldr r0, =gFireRedMenuElements3_Pal
_0819A2E6:
adds r1, r2, 0
movs r2, 0x20
@@ -5292,7 +5292,7 @@ blit_move_info_icon: @ 819A2F8
adds r1, r4
ldrh r5, [r1, 0x2]
lsls r5, 5
ldr r4, =gUnknown_08DC4378
ldr r4, =gFireRedMenuElements_Gfx
adds r5, r4
movs r4, 0x80
str r4, [sp]
asm/mon_markings.s
+2 -2
View File
@@ -480,7 +480,7 @@ sub_811FC80: @ 811FC80
adds r0, 0x1E
strh r5, [r0]
add r1, sp, 0x20
ldr r0, =gUnknown_08DC9628
ldr r0, =gPokenavConditionMarker_Gfx
str r0, [sp, 0x20]
movs r0, 0xC8
lsls r0, 2
@@ -503,7 +503,7 @@ sub_811FC80: @ 811FC80
add r0, sp, 0x34
strh r6, [r0]
add r1, sp, 0x38
ldr r0, =gUnknown_08DC9608
ldr r0, =gPokenavConditionMarker_Pal
str r0, [sp, 0x38]
adds r0, r6, 0x1
strh r0, [r1, 0x4]
asm/naming_screen.s
+2 -2
View File
@@ -3712,7 +3712,7 @@ _080E4C4A:
thumb_func_start choose_name_or_words_screen_load_bg_tile_patterns
choose_name_or_words_screen_load_bg_tile_patterns: @ 80E4C54
push {r4-r6,lr}
ldr r0, =gUnknown_08DD3838
ldr r0, =gNamingScreenMenu_Gfx
ldr r6, =gUnknown_02039F94
ldr r1, [r6]
ldr r4, =0x00001810
@@ -3760,7 +3760,7 @@ sub_80E4CB8: @ 80E4CB8
thumb_func_start choose_name_or_words_screen_apply_bg_pals
choose_name_or_words_screen_apply_bg_pals: @ 80E4CC8
push {lr}
ldr r0, =gUnknown_08DD3778
ldr r0, =gNamingScreenMenu_Pal
movs r1, 0
movs r2, 0xC0
bl LoadPalette
asm/overworld.s
+9 -9
View File
@@ -50,8 +50,8 @@ flag_var_implications_of_teleport_: @ 8084660
.pool
thumb_func_end flag_var_implications_of_teleport_
thumb_func_start sub_808469C
sub_808469C: @ 808469C
thumb_func_start Overworld_ResetStateAfterTeleport
Overworld_ResetStateAfterTeleport: @ 808469C
push {lr}
bl player_avatar_init_params_reset
ldr r0, =0x0000088b
@@ -69,7 +69,7 @@ sub_808469C: @ 808469C
pop {r0}
bx r0
.pool
thumb_func_end sub_808469C
thumb_func_end Overworld_ResetStateAfterTeleport
thumb_func_start flagmods_08054D70
flagmods_08054D70: @ 80846E4
@@ -2212,8 +2212,8 @@ call_ResetMapMusic: @ 8085778
bx r0
thumb_func_end call_ResetMapMusic
thumb_func_start sub_8085784
sub_8085784: @ 8085784
thumb_func_start Overworld_PlaySpecialMapMusic
Overworld_PlaySpecialMapMusic: @ 8085784
push {r4,lr}
bl sav1_map_get_music
lsls r0, 16
@@ -2261,7 +2261,7 @@ _080857E8:
pop {r0}
bx r0
.pool
thumb_func_end sub_8085784
thumb_func_end Overworld_PlaySpecialMapMusic
thumb_func_start Overworld_SetSavedMusic
Overworld_SetSavedMusic: @ 80857F4
@@ -2772,8 +2772,8 @@ _08085BF0:
bx r1
thumb_func_end is_light_level_1_2_3_5_or_6
thumb_func_start is_light_level_1_2_3_or_6
is_light_level_1_2_3_or_6: @ 8085BF4
thumb_func_start Overworld_MapTypeAllowsTeleportAndFly
Overworld_MapTypeAllowsTeleportAndFly: @ 8085BF4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2793,7 +2793,7 @@ _08085C0E:
_08085C10:
pop {r1}
bx r1
thumb_func_end is_light_level_1_2_3_or_6
thumb_func_end Overworld_MapTypeAllowsTeleportAndFly
thumb_func_start is_light_level_8_or_9
is_light_level_8_or_9: @ 8085C14
asm/party_menu.s
+10 -10
View File
@@ -487,7 +487,7 @@ _081B05F0:
.4byte _081B0694
_081B0610:
ldr r4, =gUnknown_0203CEE0
ldr r0, =gUnknown_08D967EC
ldr r0, =gPartyMenuMisc_Gfx
mov r1, sp
bl malloc_and_decompress
adds r1, r0, 0
@@ -505,14 +505,14 @@ _081B0638:
lsls r0, 24
cmp r0, 0
bne _081B06B4
ldr r0, =gUnknown_08D96BA0
ldr r0, =gPartyMenuMisc_Tilemap
ldr r1, =gUnknown_0203CEE4
ldr r1, [r1]
bl LZDecompressWram
b _081B069A
.pool
_081B0658:
ldr r0, =gUnknown_08D96AB4
ldr r0, =gPartyMenuMisc_Pal
movs r2, 0xB0
lsls r2, 1
movs r1, 0
@@ -10027,8 +10027,8 @@ _081B572A:
.pool
thumb_func_end sub_81B56D8
thumb_func_start hm_add_c3_launch_phase_2
hm_add_c3_launch_phase_2: @ 81B5738
thumb_func_start FieldCallback_Teleport
FieldCallback_Teleport: @ 81B5738
push {lr}
bl pal_fill_black
ldr r0, =task_launch_hm_phase_2
@@ -10038,7 +10038,7 @@ hm_add_c3_launch_phase_2: @ 81B5738
pop {r1}
bx r1
.pool
thumb_func_end hm_add_c3_launch_phase_2
thumb_func_end FieldCallback_Teleport
thumb_func_start task_launch_hm_phase_2
task_launch_hm_phase_2: @ 81B5750
@@ -10160,7 +10160,7 @@ sub_81B5820: @ 81B5820
cmp r0, 0x1
bne _081B585C
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm_surf_run_dp02scr
@@ -10199,7 +10199,7 @@ sub_81B5884: @ 81B5884
push {lr}
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
bl is_light_level_1_2_3_or_6
bl Overworld_MapTypeAllowsTeleportAndFly
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -10278,7 +10278,7 @@ hm_prepare_waterfall: @ 81B58F0
cmp r0, 0x1
bne _081B594C
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm2_waterfall
@@ -10325,7 +10325,7 @@ sub_81B5974: @ 81B5974
.pool
_081B5990:
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_81B5958
asm/pokedex.s
+26 -26
View File
@@ -2028,7 +2028,7 @@ _080BC56E:
bl SetGpuReg
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0855D298
ldr r1, =gBgTemplates_0855D298
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
@@ -2054,7 +2054,7 @@ _080BC56E:
adds r1, r0, 0
movs r0, 0
bl SetBgTilemapBuffer
ldr r1, =gUnknown_08DC1934
ldr r1, =gPokedexMenu_Gfx
movs r2, 0x80
lsls r2, 6
str r6, [sp]
@@ -2119,7 +2119,7 @@ _080BC682:
lsls r0, 31
lsrs r0, 31
bl sub_80BC844
ldr r0, =gUnknown_0855D2A8
ldr r0, =sWindowTemplates_0855D2A8
bl InitWindows
bl DeactivateAllTextPrinters
movs r0, 0
@@ -2141,9 +2141,9 @@ _080BC6CC:
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
ldr r0, =gUnknown_0855D26C
ldr r0, =gSpriteSheets_0855D26C
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0855D27C
ldr r0, =gSpritePalettes_0855D26C
bl LoadSpritePalettes
adds r0, r5, 0
bl sub_80BDB7C
@@ -2291,14 +2291,14 @@ sub_80BC844: @ 80BC844
lsrs r0, 24
cmp r0, 0x1
bne _080BC858
ldr r0, =gUnknown_08DC17B6
ldr r0, =gPokedexHoennBg_Pal + 0x2
b _080BC862
.pool
_080BC858:
bl IsNationalPokedexEnabled
cmp r0, 0
bne _080BC870
ldr r0, =gUnknown_08DC16F6
ldr r0, =gPokedexText_Pal + 2
_080BC862:
movs r1, 0x1
movs r2, 0xBE
@@ -2306,7 +2306,7 @@ _080BC862:
b _080BC87A
.pool
_080BC870:
ldr r0, =gUnknown_08DC1876
ldr r0, =gPokedexNationalBg_Pal + 0x2
movs r1, 0x1
movs r2, 0xBE
bl LoadPalette
@@ -2609,7 +2609,7 @@ _080BCACC:
movs r7, 0x1
mov r9, r7
_080BCADA:
ldr r1, =gUnknown_0855C6A4
ldr r1, =gPokedexOrder_Alphabetical
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -2687,7 +2687,7 @@ _080BCB78:
ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c
_080BCB82:
ldr r1, =gUnknown_0855C9DA
ldr r1, =gPokedexOrder_Weight
asrs r0, 15
adds r0, r1
ldrh r0, [r0]
@@ -2752,7 +2752,7 @@ _080BCC08:
ldr r0, =0x00000181
mov r9, r0
_080BCC16:
ldr r1, =gUnknown_0855C9DA
ldr r1, =gPokedexOrder_Weight
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -2819,7 +2819,7 @@ _080BCCA0:
ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c
_080BCCAA:
ldr r1, =gUnknown_0855CCDE
ldr r1, =gPokedexOrder_Height
asrs r0, 15
adds r0, r1
ldrh r0, [r0]
@@ -2884,7 +2884,7 @@ _080BCD30:
ldr r0, =0x00000181
mov r9, r0
_080BCD3E:
ldr r1, =gUnknown_0855CCDE
ldr r1, =gPokedexOrder_Height
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -3517,7 +3517,7 @@ sub_80BD23C: @ 80BD23C
b _080BD266
.pool
_080BD264:
ldr r4, =gUnknown_0855D2FE
ldr r4, =sText_TenDashes
_080BD266:
str r5, [sp]
movs r0, 0
@@ -6369,7 +6369,7 @@ _080BEACA:
b _080BEDA0
.pool
_080BEAF0:
ldr r1, =gUnknown_08DC1934
ldr r1, =gPokedexMenu_Gfx
movs r2, 0x80
lsls r2, 6
movs r0, 0
@@ -7257,7 +7257,7 @@ _080BF2B6:
b _080BF5B2
.pool
_080BF310:
ldr r1, =gUnknown_08DC1934
ldr r1, =gPokedexMenu_Gfx
movs r2, 0x80
lsls r2, 6
movs r0, 0
@@ -7856,7 +7856,7 @@ _080BF88E:
b _080BFB94
.pool
_080BF8D8:
ldr r1, =gUnknown_08DC1934
ldr r1, =gPokedexMenu_Gfx
movs r2, 0x80
lsls r2, 6
movs r0, 0
@@ -8543,7 +8543,7 @@ _080BFE92:
b _080C0074
.pool
_080BFF0C:
ldr r1, =gUnknown_08DC1934
ldr r1, =gPokedexMenu_Gfx
movs r2, 0x80
lsls r2, 6
movs r0, 0
@@ -8751,14 +8751,14 @@ _080C00E8:
ands r1, r0
cmp r1, 0
beq _080C0114
ldr r0, =gUnknown_08DC16F6
ldr r0, =gPokedexText_Pal + 2
movs r1, 0x31
movs r2, 0xE
bl LoadPalette
b _080C011E
.pool
_080C0114:
ldr r0, =gUnknown_08DC1756
ldr r0, =gPokedexCaughtScreenFade_Pal + 0x2
movs r1, 0x31
movs r2, 0xE
bl LoadPalette
@@ -11135,7 +11135,7 @@ _080C1332:
bl DeactivateAllTextPrinters
movs r0, 0
bl PutWindowTilemap
ldr r1, =gUnknown_08DC3304
ldr r1, =gPokedexSearchMenu_Gfx
movs r2, 0x80
lsls r2, 6
str r5, [sp]
@@ -11145,7 +11145,7 @@ _080C1332:
bl IsNationalPokedexEnabled
cmp r0, 0
bne _080C13E4
ldr r1, =gUnknown_08DC3A0C
ldr r1, =gPokedexSearch2_Tilemap
movs r0, 0x3
movs r2, 0
movs r3, 0
@@ -11153,13 +11153,13 @@ _080C1332:
b _080C13F0
.pool
_080C13E4:
ldr r1, =gUnknown_08DC3870
ldr r1, =gPokedexSearch1_Tilemap
movs r0, 0x3
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
_080C13F0:
ldr r0, =gUnknown_08DC3286
ldr r0, =gPokedexSearchMenu_Pal + 0x2
movs r1, 0x1
movs r2, 0x7E
bl LoadPalette
@@ -11172,9 +11172,9 @@ _080C13F0:
b _080C1516
.pool
_080C1414:
ldr r0, =gUnknown_0855D26C
ldr r0, =gSpriteSheets_0855D26C
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0855D27C
ldr r0, =gSpritePalettes_0855D26C
bl LoadSpritePalettes
adds r0, r4, 0
bl sub_80C2594
asm/pokedex_area_screen.s
+1 -1
View File
@@ -1781,7 +1781,7 @@ sub_813D8A8: @ 813D8A8
str r1, [sp]
ldr r0, =0x00030600
str r0, [sp, 0x4]
ldr r0, =gUnknown_08DC4140
ldr r0, =gPokedexAreaScreenAreaUnknown_Gfx
bl LZ77UnCompWram
mov r0, sp
bl LoadSpriteSheet
asm/pokemon_icon.s
+9 -9
View File
@@ -28,15 +28,15 @@ sub_80D2CC4: @ 80D2CC4
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gUnknown_0857C570
ldr r0, =sMonIconOamData
str r0, [sp, 0x18]
adds r0, r4, 0
adds r2, r5, 0
bl GetMonIconPtr
str r0, [sp, 0x1C]
ldr r0, =gUnknown_0857C5B4
ldr r0, =sMonIconAnims
str r0, [sp, 0x20]
ldr r0, =gUnknown_0857C5E8
ldr r0, =sMonIconAffineAnims
str r0, [sp, 0x24]
str r6, [sp, 0x28]
ldr r0, =gMonIconPaletteIndices
@@ -102,13 +102,13 @@ sub_80D2D78: @ 80D2D78
lsls r6, 24
lsrs r6, 24
mov r3, sp
ldr r2, =gUnknown_0857C570
ldr r2, =sMonIconOamData
str r2, [sp]
movs r2, 0
str r2, [sp, 0x4]
ldr r2, =gUnknown_0857C5B4
ldr r2, =sMonIconAnims
str r2, [sp, 0x8]
ldr r2, =gUnknown_0857C5E8
ldr r2, =sMonIconAffineAnims
str r2, [sp, 0xC]
str r1, [sp, 0x10]
ldr r2, =gMonIconPaletteIndices
@@ -601,7 +601,7 @@ _080D3126:
strb r7, [r5]
b _080D31A4
_080D312A:
ldr r2, =gUnknown_0857C5F0
ldr r2, =sSpriteImageSizes
ldrb r1, [r4, 0x3]
lsrs r1, 6
lsls r1, 1
@@ -689,7 +689,7 @@ sub_80D31B4: @ 80D31B4
mov r8, r0
movs r0, 0
str r0, [sp, 0x30]
ldr r2, =gUnknown_0857C5F0
ldr r2, =sSpriteImageSizes
mov r0, r9
ldr r6, [r0]
ldrb r1, [r6, 0x3]
@@ -776,7 +776,7 @@ sub_80D328C: @ 80D328C
sub sp, 0x8
movs r1, 0
str r1, [sp]
ldr r3, =gUnknown_0857C5F0
ldr r3, =sSpriteImageSizes
ldrb r2, [r0, 0x3]
lsrs r2, 6
lsls r2, 1
asm/pokemon_storage_system.s
+4 -4
View File
@@ -1106,7 +1106,7 @@ sub_80C7958: @ 80C7958
ldrh r0, [r3]
adds r0, 0x1
strh r0, [r1]
ldr r0, =gUnknown_08571710
ldr r0, =sSpriteAnimTable_8571710
str r0, [sp, 0xC]
movs r4, 0
_080C7A10:
@@ -5343,7 +5343,7 @@ sub_80CA044: @ 80CA044
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
ldr r1, =gUnknown_08DD2FE8
ldr r1, =gPSSMenu_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x1
@@ -6104,7 +6104,7 @@ sub_80CA704: @ 80CA704
ldr r1, [r4]
adds r1, 0xB0
bl LZ77UnCompWram
ldr r0, =gUnknown_08DD36A8
ldr r0, =gPSSMenu_Pal
movs r1, 0x10
movs r2, 0x20
bl LoadPalette
@@ -9124,7 +9124,7 @@ _080CBF80:
adds r1, r3
ldr r0, [r1]
ldr r2, [r0]
ldr r0, =gUnknown_0857291C
ldr r0, =gSpriteAffineAnimTable_857291C
str r0, [r2, 0x10]
ldr r0, [r1]
ldr r0, [r0]
asm/pokemon_summary_screen.s
+1 -1
View File
@@ -2411,7 +2411,7 @@ _081C5264:
.4byte _081C52D4
_081C5278:
bl reset_temp_tile_data_buffers
ldr r1, =gUnknown_08D9A620
ldr r1, =gBagScreen_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x2
asm/pokenav.s
+14 -14
View File
@@ -683,7 +683,7 @@ _081C77B0:
movs r0, 0
bl sub_81C763C
adds r4, r0, 0
ldr r1, =gUnknown_08DC7B80
ldr r1, =gPokenavHeader_Gfx
movs r0, 0
str r0, [sp]
movs r2, 0
@@ -693,12 +693,12 @@ _081C77B0:
movs r0, 0
adds r1, r4, 0
bl SetBgTilemapBuffer
ldr r1, =gUnknown_08DC7D84
ldr r1, =gPokenavHeader_Tilemap
movs r0, 0
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
ldr r0, =gUnknown_08DC7B60
ldr r0, =gPokenavHeader_Pal
movs r1, 0
movs r2, 0x20
bl sub_81C7944
@@ -1571,7 +1571,7 @@ sub_81C7E58: @ 81C7E58
bl sub_8034974
adds r5, r0, 0
lsls r4, 5
ldr r0, =gUnknown_08DC7F00
ldr r0, =gPokenavLeftHeader_Pal
adds r4, r0
movs r0, 0x1
bl IndexOfSpritePaletteTag
@@ -1653,7 +1653,7 @@ sub_81C7F24: @ 81C7F24
bl sub_8034974
adds r5, r0, 0
lsls r4, 5
ldr r0, =gUnknown_08DC7F00
ldr r0, =gPokenavLeftHeader_Pal
adds r4, r0
movs r0, 0x2
bl IndexOfSpritePaletteTag
@@ -5198,7 +5198,7 @@ _081C9A5C:
ldr r0, =gUnknown_08620194
movs r1, 0x3
bl sub_81C7B54
ldr r1, =gUnknown_08DC90E0
ldr r1, =gPokenavMessageBox_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x1
@@ -5209,14 +5209,14 @@ _081C9A5C:
adds r1, 0x8C
movs r0, 0x1
bl SetBgTilemapBuffer
ldr r1, =gUnknown_08DC9130
ldr r1, =gPokenavMessageBox_Tilemap
movs r0, 0x1
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
movs r0, 0x1
bl CopyBgTilemapBufferToVram
ldr r0, =gUnknown_08DC90C0
ldr r0, =gPokenavMessageBox_Pal
movs r1, 0x10
movs r2, 0x20
bl sub_81C7944
@@ -7924,7 +7924,7 @@ sub_81CAF78: @ 81CAF78
strb r0, [r6]
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
bl is_light_level_1_2_3_or_6
bl Overworld_MapTypeAllowsTeleportAndFly
lsls r0, 24
cmp r0, 0
bne _081CAFA4
@@ -11374,7 +11374,7 @@ sub_81CCA1C: @ 81CCA1C
movs r1, 0x10
movs r2, 0x20
bl sub_81C7944
ldr r0, =gUnknown_08DC91E8
ldr r0, =gHoennMapZoomIcons_Pal
movs r1, 0x30
movs r2, 0x20
bl sub_81C7944
@@ -13941,7 +13941,7 @@ _081CDF18:
ldr r1, =0x0000040b
movs r0, 0x52
bl SetGpuReg
ldr r1, =gUnknown_08DC6548
ldr r1, =gPokenavCondition_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x3
@@ -13973,7 +13973,7 @@ _081CDFB8:
beq _081CDFC4
b _081CE2C0
_081CDFC4:
ldr r0, =gUnknown_08DC6DFC
ldr r0, =gPokenavCondition_Tilemap
adds r4, r5, 0x4
adds r1, r4, 0
bl LZ77UnCompVram
@@ -13983,7 +13983,7 @@ _081CDFC4:
bl sub_81CDD5C
cmp r0, 0x1
bne _081CDFF2
ldr r1, =gUnknown_08DC7070
ldr r1, =gPokenavOptions_Tilemap
movs r0, 0x9
str r0, [sp]
movs r0, 0x4
@@ -13995,7 +13995,7 @@ _081CDFC4:
_081CDFF2:
movs r0, 0x3
bl CopyBgTilemapBufferToVram
ldr r0, =gUnknown_08DC6528
ldr r0, =gPokenavCondition_Pal
movs r1, 0x10
movs r2, 0x20
bl sub_81C7944
asm/rayquaza_scene.s
+34 -34
View File
@@ -1119,7 +1119,7 @@ sub_81D706C: @ 81D706C
push {r4,lr}
sub sp, 0x4
bl reset_temp_tile_data_buffers
ldr r1, =gUnknown_08DA33C0
ldr r1, =gRaySceneClouds_Gfx
movs r0, 0
str r0, [sp]
movs r2, 0
@@ -1130,22 +1130,22 @@ _081D7082:
lsls r0, 24
cmp r0, 0
bne _081D7082
ldr r0, =gUnknown_08DA3988
ldr r0, =gRaySceneClouds2_Tilemap
ldr r4, =gUnknown_0203CF60
ldr r1, [r4]
adds r1, 0x4
bl LZDecompressWram
ldr r0, =gUnknown_08DA3824
ldr r0, =gRaySceneClouds1_Tilemap
ldr r1, [r4]
ldr r2, =0x00000804
adds r1, r2
bl LZDecompressWram
ldr r0, =gUnknown_08DA3A88
ldr r0, =gRaySceneClouds3_Tilemap
ldr r1, [r4]
ldr r2, =0x00001004
adds r1, r2
bl LZDecompressWram
ldr r0, =gUnknown_08DA37E8
ldr r0, =gRaySceneClouds_Pal
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
@@ -1172,8 +1172,8 @@ _081D7082:
.pool
thumb_func_end sub_81D706C
thumb_func_start task_add_00_WIN0V_open_close_above_and_more
task_add_00_WIN0V_open_close_above_and_more: @ 81D7134
thumb_func_start sub_81D7134
sub_81D7134: @ 81D7134
push {r4-r7,lr}
sub sp, 0x8
lsls r0, 24
@@ -1264,7 +1264,7 @@ _081D71EE:
pop {r0}
bx r0
.pool
thumb_func_end task_add_00_WIN0V_open_close_above_and_more
thumb_func_end sub_81D7134
thumb_func_start sub_81D7228
sub_81D7228: @ 81D7228
@@ -2811,20 +2811,20 @@ sub_81D7E9C: @ 81D7E9C
push {r4,lr}
sub sp, 0x4
bl reset_temp_tile_data_buffers
ldr r1, =gUnknown_08DA33C0
ldr r1, =gRaySceneClouds_Gfx
movs r4, 0
str r4, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_08DA4F70
ldr r1, =gRaySceneOvercast_Gfx
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_08DA3C94
ldr r1, =gRaySceneRayquaza_Gfx
str r4, [sp]
movs r0, 0x2
movs r2, 0
@@ -2835,22 +2835,22 @@ _081D7ED0:
lsls r0, 24
cmp r0, 0
bne _081D7ED0
ldr r0, =gUnknown_08DA3988
ldr r0, =gRaySceneClouds2_Tilemap
ldr r4, =gUnknown_0203CF60
ldr r1, [r4]
adds r1, 0x4
bl LZDecompressWram
ldr r0, =gUnknown_08DA60B8
ldr r0, =gRaySceneOvercast_Tilemap
ldr r1, [r4]
ldr r2, =0x00000804
adds r1, r2
bl LZDecompressWram
ldr r0, =gUnknown_08DA4DEC
ldr r0, =gRaySceneRayquaza_Tilemap
ldr r1, [r4]
ldr r2, =0x00001004
adds r1, r2
bl LZDecompressWram
ldr r0, =gUnknown_08DA4DA8
ldr r0, =gRaySceneRayquaza_Pal
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
@@ -3354,14 +3354,14 @@ sub_81D8358: @ 81D8358
push {r4-r7,lr}
sub sp, 0xC
bl reset_temp_tile_data_buffers
ldr r1, =gUnknown_08DA7528
ldr r1, =gRaySceneRayquazaLight_Gfx
movs r4, 0
str r4, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_08DA69BC
ldr r1, =gRaySceneOvercast2_Gfx
str r4, [sp]
movs r0, 0x1
movs r2, 0
@@ -3374,12 +3374,12 @@ _081D8380:
lsrs r6, r0, 24
cmp r6, 0
bne _081D8380
ldr r0, =gUnknown_08DA7AAC
ldr r0, =gRaySceneRayquazaLight_Tilemap
ldr r5, =gUnknown_0203CF60
ldr r1, [r5]
adds r1, 0x4
bl LZDecompressWram
ldr r0, =gUnknown_08DA7784
ldr r0, =gRaySceneOvercast2_Tilemap
ldr r1, [r5]
ldr r4, =0x00001804
adds r1, r4
@@ -3406,7 +3406,7 @@ _081D8380:
ldr r2, =0x010000d0
adds r0, r7, 0
bl CpuFastSet
ldr r0, =gUnknown_08DA7744
ldr r0, =gRaySceneOvercast2_Pal
movs r1, 0
movs r2, 0x40
bl LoadCompressedPalette
@@ -3961,20 +3961,20 @@ sub_81D88D0: @ 81D88D0
push {r4,lr}
sub sp, 0x4
bl reset_temp_tile_data_buffers
ldr r1, =gUnknown_08DA80BC
ldr r1, =gRaySceneRayquazaChase_Gfx
movs r4, 0
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_08DA7EAC
ldr r1, =gRaySceneChaseStreaks_Gfx
str r4, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_08DA7C30
ldr r1, =gRaySceneChaseBg_Gfx
str r4, [sp]
movs r0, 0x3
movs r2, 0
@@ -3985,27 +3985,27 @@ _081D8904:
lsls r0, 24
cmp r0, 0
bne _081D8904
ldr r0, =gUnknown_08DA8D6C
ldr r0, =gRayChaseRayquazaChase2_Tilemap
ldr r4, =gUnknown_0203CF60
ldr r1, [r4]
adds r1, 0x4
bl LZDecompressWram
ldr r0, =gUnknown_08DA8B40
ldr r0, =gRayChaseRayquazaChase_Tilemap
ldr r1, [r4]
ldr r2, =0x00000804
adds r1, r2
bl LZDecompressWram
ldr r0, =gUnknown_08DA7FB4
ldr r0, =gRaySceneChaseStreaks_Tilemap
ldr r1, [r4]
ldr r2, =0x00001004
adds r1, r2
bl LZDecompressWram
ldr r0, =gUnknown_08DA7D6C
ldr r0, =gRaySceneChaseBg_Tilemap
ldr r1, [r4]
ldr r2, =0x00001804
adds r1, r2
bl LZDecompressWram
ldr r0, =gUnknown_08DA8E84
ldr r0, =gRaySceneChase_Pal
movs r1, 0
movs r2, 0x80
bl LoadCompressedPalette
@@ -4407,14 +4407,14 @@ sub_81D8CC4: @ 81D8CC4
push {r4,lr}
sub sp, 0x4
bl reset_temp_tile_data_buffers
ldr r1, =gUnknown_08DAAB24
ldr r1, =gRaySceneHushRing_Gfx
movs r4, 0
str r4, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_08DAA8B4
ldr r1, =gRaySceneHushBg_Gfx
str r4, [sp]
movs r0, 0
movs r2, 0
@@ -4425,22 +4425,22 @@ _081D8CEA:
lsls r0, 24
cmp r0, 0
bne _081D8CEA
ldr r0, =gUnknown_08DAAE54
ldr r0, =gRaySceneHushRing_Tilemap
ldr r4, =gUnknown_0203CF60
ldr r1, [r4]
ldr r2, =0x00000804
adds r1, r2
bl LZDecompressWram
ldr r0, =gUnknown_08DAAC1C
ldr r0, =gRaySceneHushBg_Tilemap
ldr r1, [r4]
adds r1, 0x4
bl LZDecompressWram
ldr r0, =gUnknown_08DAAF98
ldr r0, =gRaySceneHushRing_Map
ldr r1, [r4]
ldr r2, =0x00001004
adds r1, r2
bl LZDecompressWram
ldr r0, =gUnknown_08DAAFEC
ldr r0, =gRaySceneHushBg_Pal
movs r1, 0
movs r2, 0x60
bl LoadCompressedPalette
asm/rom6.s
+3 -3
View File
@@ -268,7 +268,7 @@ sub_8135654: @ 8135654
lsrs r0, 24
strh r0, [r4]
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_8179834
@@ -285,7 +285,7 @@ _0813568C:
b _081356AC
_0813569E:
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =sub_81356C4
@@ -361,7 +361,7 @@ sub_813572C: @ 813572C
b _0813574C
_0813573E:
ldr r1, =gUnknown_03005DB0
ldr r0, =hm_add_c3_launch_phase_2
ldr r0, =FieldCallback_Teleport
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm2_dig
asm/rotating_gate.s
+2 -2
View File
@@ -410,7 +410,7 @@ sub_80FBAE4: @ 80FBAE4
adds r0, r4, 0x4
lsls r0, 24
lsrs r4, r0, 24
bl sub_811A138
bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x1
@@ -433,7 +433,7 @@ _080FBB2A:
adds r0, 0x8
lsls r0, 24
lsrs r4, r0, 24
bl sub_811A138
bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x1
asm/roulette.s
+1 -1
View File
@@ -452,7 +452,7 @@ _08140662:
lsls r2, 1
movs r1, 0
bl LoadPalette
ldr r1, =gUnknown_08DBC2E8
ldr r1, =gRouletteMenuTiles
movs r4, 0
str r4, [sp]
movs r0, 0x1
asm/slot_machine.s
+4 -4
View File
@@ -10588,7 +10588,7 @@ sub_812F7E4: @ 812F7E4
bl Alloc
adds r1, r0, 0
str r1, [r4]
ldr r0, =gUnknown_08DD0050
ldr r0, =gSlotMachineReelTime_Gfx
bl LZDecompressWram
ldr r4, =gUnknown_0203AAD8
movs r0, 0xD8
@@ -10715,14 +10715,14 @@ sub_812F908: @ 812F908
bl Alloc
adds r1, r0, 0
str r1, [r4]
ldr r0, =gUnknown_08DCDB30
ldr r0, =gSlotMachineMenu_Gfx
bl LZDecompressWram
ldr r1, [r4]
movs r0, 0x2
adds r2, r5, 0
movs r3, 0
bl LoadBgTiles
ldr r0, =gUnknown_08DCDA90
ldr r0, =gSlotMachineMenu_Pal
movs r1, 0
movs r2, 0xA0
bl LoadPalette
@@ -10748,7 +10748,7 @@ sub_812F958: @ 812F958
thumb_func_start sub_812F968
sub_812F968: @ 812F968
push {lr}
ldr r1, =gUnknown_08DCE770
ldr r1, =gSlotMachineMenu_Tilemap
movs r2, 0xA0
lsls r2, 3
movs r0, 0x2
asm/trade.s
+5 -5
View File
@@ -8105,11 +8105,11 @@ _0807B668:
ldr r1, =0x00005206
movs r0, 0xC
bl SetGpuReg
ldr r0, =gUnknown_08DD7300
ldr r0, =gTradeGba2_Pal
movs r1, 0x10
movs r2, 0x60
bl LoadPalette
ldr r3, =gUnknown_08DD7360
ldr r3, =gTradeGba_Gfx
ldr r4, =0x06004000
movs r5, 0xA1
lsls r5, 5
@@ -8168,7 +8168,7 @@ _0807B726:
ldr r1, =0x80000800
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
ldr r3, =gUnknown_08DD7360
ldr r3, =gTradeGba_Gfx
movs r4, 0xC0
lsls r4, 19
movs r5, 0xA1
@@ -8446,11 +8446,11 @@ _0807B9FC:
ldr r1, =0x00005206
movs r0, 0xC
bl SetGpuReg
ldr r0, =gUnknown_08DD7300
ldr r0, =gTradeGba2_Pal
movs r1, 0x10
movs r2, 0x60
bl LoadPalette
ldr r3, =gUnknown_08DD7360
ldr r3, =gTradeGba_Gfx
ldr r4, =0x06004000
movs r5, 0xA1
lsls r5, 5
asm/trainer_card.s
+5 -5
View File
@@ -601,12 +601,12 @@ _080C2C04:
ldrb r0, [r0]
cmp r0, 0
beq _080C2C28
ldr r0, =gUnknown_08DD1AB8
ldr r0, =gEmeraldTrainerCard_Gfx
ldr r2, =0x000019a8
b _080C2C4A
.pool
_080C2C28:
ldr r0, =gUnknown_08DD246C
ldr r0, =gFireRedTrainerCard_Gfx
ldr r2, =0x000019a8
b _080C2C4A
.pool
@@ -3317,7 +3317,7 @@ _080C4418:
ldrb r0, [r0]
cmp r0, 0
beq _080C447C
ldr r1, =gUnknown_0856FAE4
ldr r1, =gEmeraldTrainerCardStarPals
ldr r3, =0x00000535
adds r0, r2, r3
ldrb r0, [r0]
@@ -3344,7 +3344,7 @@ _080C4418:
b _080C44B2
.pool
_080C447C:
ldr r1, =gUnknown_0856FAF8
ldr r1, =gFireRedTrainerCardStarPals
ldr r3, =0x00000535
adds r0, r2, r3
ldrb r0, [r0]
@@ -5766,7 +5766,7 @@ sub_80C58D4: @ 80C58D4
beq _080C5914
cmp r0, 0x2
beq _080C591C
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
b _080C5924
.pool
_080C5914:
asm/use_pokeblock.s
+5 -5
View File
@@ -2397,7 +2397,7 @@ _08167A74:
b _08167B7E
.pool
_08167A9C:
ldr r0, =gUnknown_08DCCF7C
ldr r0, =gUsePokeblockGraph_Gfx
ldr r1, =gUnknown_0203BCA4
_08167AA0:
ldr r1, [r1]
@@ -2405,11 +2405,11 @@ _08167AA0:
b _08167B7E
.pool
_08167AB0:
ldr r0, =gUnknown_08DCD81C
ldr r0, =gUsePokeblockGraph_Tilemap
ldr r1, =gUnknown_0203BCA0
ldr r1, [r1]
bl LZ77UnCompVram
ldr r0, =gUnknown_08DCCF5C
ldr r0, =gUsePokeblockGraph_Pal
movs r1, 0x20
movs r2, 0x20
bl LoadPalette
@@ -2431,7 +2431,7 @@ _08167AEC:
ldr r1, [r0]
movs r0, 0x1
bl SetBgTilemapBuffer
ldr r1, =gUnknown_08DCDA30
ldr r1, =gUsePokeblockNatureWin_Pal
movs r0, 0xC
str r0, [sp]
movs r0, 0x4
@@ -3259,7 +3259,7 @@ sub_8168248: @ 8168248
ldr r0, [r0]
str r0, [sp, 0x8]
str r1, [sp, 0xC]
ldr r0, =gUnknown_08DCCBB8
ldr r0, =gUsePokeblockCondition_Gfx
str r0, [sp]
ldr r1, =0xffff0000
ldr r0, [sp, 0x4]
build_tools.sh
+8
View File
@@ -0,0 +1,8 @@
#!/bin/sh
make -C tools/gbagfx
make -C tools/scaninc
make -C tools/preproc
make -C tools/bin2c
make -C tools/rsfont
make -C tools/aif2pcm
make -C tools/ramscrgen
data/battle_ai_scripts.s
+3374 -62
View File
File diff suppressed because it is too large. Load diff
data/battle_anim_80A9C70.s
+3
View File
@@ -27,6 +27,9 @@ gUnknown_0853EE34:: @ 853EE34
.align 2
gUnknown_0853EE38:: @ 853EE38
spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30
.align 2
gUnknown_0853EE50:: @ 853EE50
spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4
.align 2
data/battle_anim_80FE840.s
+6
View File
@@ -16,7 +16,13 @@ gUnknown_08592114:: @ 8592114
.align 2
gUnknown_08592118:: @ 8592118
spr_template 0x2753, 0x2753, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
.align 2
gUnknown_08592130:: @ 8592130
spr_template 0x2754, 0x2754, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
.align 2
gUnknown_08592148:: @ 8592148
spr_template 0x2751, 0x2751, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
.align 2
data/battle_anim_815A0D4.s
+20
View File
@@ -18,9 +18,11 @@ gUnknown_085CE020:: @ 85CE020
spr_template 0x2799, 0x2799, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
gUnknown_085CE038:: @ 85CE038
spr_template 0x2720, 0x2720, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4
.align 2
gUnknown_085CE050:: @ 85CE050
spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC
.align 2
@@ -37,9 +39,11 @@ gUnknown_085CE07C:: @ 85CE07C
spr_template 0x27ce, 0x27ce, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
gUnknown_085CE094::
spr_template 0x27cf, 0x27cf, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0
.align 2
gUnknown_085CE0AC::
spr_template 0x27cd, 0x27cd, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254
.align 2
@@ -65,6 +69,7 @@ gUnknown_085CE104:: @ 85CE104
spr_template 0x27cb, 0x27cb, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0
.align 2
gUnknown_085CE11C:: @ 85CE11C
spr_template 0x27a8, 0x27a8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4
.align 2
@@ -147,9 +152,11 @@ gUnknown_085CE22C:: @ 85CE22C
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934
.align 2
gUnknown_085CE244::
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4
.align 2
gUnknown_085CE25C::
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0
.align 2
@@ -319,8 +326,11 @@ gUnknown_085CE58C:: @ 85CE58C
.align 2
gUnknown_085CE590:: @ 85CE590
spr_template 0x27ff, 0x27ff, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C
gUnknown_085CE5A8::
spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88
gUnknown_085CE5C0::
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94
gUnknown_085CE5D8::
spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4
.align 2
@@ -410,6 +420,7 @@ gUnknown_085CE7D4:: @ 85CE7D4
.align 2
gUnknown_085CE7EC:: @ 85CE7EC
spr_template 0x2808, 0x2808, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404
gUnknown_085CE804::
spr_template 0x280c, 0x280c, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444
.align 2
@@ -429,6 +440,9 @@ gUnknown_085CE844:: @ 85CE844
.align 2
gUnknown_085CE84C:: @ 85CE84C
spr_template 0x280e, 0x280e, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy
.align 2
gUnknown_085CE864::
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8
.align 2
@@ -438,11 +452,17 @@ gUnknown_085CE87C:: @ 85CE87C
.align 2
gUnknown_085CE894:: @ 85CE894
spr_template 0x280f, 0x280f, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954
gUnknown_085CE8AC::
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14
gUnknown_085CE8C4::
spr_template 0x2812, 0x2812, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84
gUnknown_085CE8DC::
spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C
gUnknown_085CE8F4::
spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4
gUnknown_085CE90C::
spr_template 0x280a, 0x280a, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C
gUnknown_085CE924::
spr_template 0x27f0, 0x27f0, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80
.align 2
data/battle_anim_8170478.s
+25 -24
View File
@@ -10,33 +10,33 @@ gUnknown_085E5088:: @ 85E5088
.align 2
gUnknown_085E5094:: @ 85E5094
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6ec
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6ed
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6ee
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6ef
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f0
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f1
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f2
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f3
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f4
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f5
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f6
obj_tiles gUnknown_08C1A490, 0x0100, 0xd6f7
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ec
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ed
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ee
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ef
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f0
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f1
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f2
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f3
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f4
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f5
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f6
obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f7
.align 2
gUnknown_085E50F4:: @ 85E50F4
obj_pal gUnknown_08C1A564, 0xd6ec
obj_pal gUnknown_08C1A564, 0xd6ed
obj_pal gUnknown_08C1A564, 0xd6ee
obj_pal gUnknown_08C1A564, 0xd6ef
obj_pal gUnknown_08C1A564, 0xd6f0
obj_pal gUnknown_08C1A564, 0xd6f1
obj_pal gUnknown_08C1A564, 0xd6f2
obj_pal gUnknown_08C1A564, 0xd6f3
obj_pal gUnknown_08C1A564, 0xd6f4
obj_pal gUnknown_08C1A564, 0xd6f5
obj_pal gUnknown_08C1A564, 0xd6f6
obj_pal gUnknown_08C1A564, 0xd6f7
obj_pal gBattleAnimSpritePalette_136, 0xd6ec
obj_pal gBattleAnimSpritePalette_136, 0xd6ed
obj_pal gBattleAnimSpritePalette_136, 0xd6ee
obj_pal gBattleAnimSpritePalette_136, 0xd6ef
obj_pal gBattleAnimSpritePalette_136, 0xd6f0
obj_pal gBattleAnimSpritePalette_136, 0xd6f1
obj_pal gBattleAnimSpritePalette_136, 0xd6f2
obj_pal gBattleAnimSpritePalette_136, 0xd6f3
obj_pal gBattleAnimSpritePalette_136, 0xd6f4
obj_pal gBattleAnimSpritePalette_136, 0xd6f5
obj_pal gBattleAnimSpritePalette_136, 0xd6f6
obj_pal gBattleAnimSpritePalette_136, 0xd6f7
.align 2
gUnknown_085E5154:: @ 85E5154
@@ -140,6 +140,7 @@ gUnknown_085E5310:: @ 85E5310
.2byte 0x0100, 0x0503, 0x0506, 0x0004
.align 2
gUnknown_085E5338:: @ 85E5338
spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
.align 2
data/battle_anim_scripts.s
+10927 -10
View File
File diff suppressed because it is too large. Load diff
data/battle_anims.s
+1 -1
View File
@@ -441,7 +441,7 @@ gBattleAnimPicTable:: @ 8524B44
obj_tiles 0x08c2cbac, 0x0800, 0x279f
obj_tiles 0x08c1bc64, 0x0200, 0x27a0
obj_tiles 0x08c1a9a0, 0x0800, 0x27a1
obj_tiles 0x08c02478, 0x0180, 0x27a2
obj_tiles gBattleAnimSpriteSheet_146, 0x0180, 0x27a2
obj_tiles 0x08c1af6c, 0x0180, 0x27a3
obj_tiles 0x08c1b178, 0x0200, 0x27a4
obj_tiles 0x08c1b0a8, 0x0200, 0x27a5
data/battle_frontier_1.s
+1 -1
View File
@@ -272,7 +272,7 @@ gUnknown_0860CF44:: @ 860CF44
.align 2
gUnknown_0860CF50:: @ 860CF50
obj_tiles gUnknown_08D85058, 0x0600, 0x0000
obj_tiles gBattleFrontierGfx_DomeOptions, 0x0600, 0x0000
null_obj_tiles
.align 2
data/battle_scripts_1.s
+1
View File
@@ -10,6 +10,7 @@
.section script_data, "aw", %progbits
.align 2
gBattleScriptsForMoveEffects:: @ 82D86A8
.4byte BattleScript_EffectHit
.4byte BattleScript_EffectSleep
data/bike.s
-58
View File
@@ -1,58 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0859744C:: @ 859744C
.4byte sub_8119224
.4byte sub_8119238
.4byte sub_8119280
.4byte sub_8119344
.align 2
gUnknown_0859745C:: @ 859745C
.4byte PlayerGoSpeed0
.4byte PlayerGoSpeed1
.4byte PlayerGoSpeed3
.align 2
gUnknown_08597468:: @ 8597468
.4byte sub_81197E4
.4byte sub_81197F4
.4byte sub_8119830
.4byte sub_81198C0
.4byte sub_81198FC
.4byte sub_8119938
.4byte sub_8119974
.4byte sub_81199B0
.4byte sub_8119A24
.4byte sub_8119A94
.4byte sub_8119AA4
.4byte sub_8119B34
.4byte sub_8119BC4
.align 2
gUnknown_0859749C:: @ 859749C
.4byte CheckMovementInputAcroBikeNormal
.4byte CheckMovementInputAcroBikeChangingDirection
.4byte CheckMovementInputAcroBikeStandingWheelie
.4byte CheckMovementInputAcroBikeBunnyHop
.4byte CheckMovementInputAcroBikeMovingWheelie
.4byte CheckMovementInputAcroBikeUnknownMode5
.4byte CheckMovementInputAcroBikeUnknownMode6
.align 2
gUnknown_085974B8:: @ 85974B8
.2byte 0x0001, 0x0002, 0x0004
.align 1
gUnknown_085974BE:: @ 85974BE
.2byte 0x0004
.align 2
gUnknown_085974C0:: @ 85974C0
.4byte 0x00000001, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000001
.4byte 0x00000002, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000002
.4byte 0x00000003, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000003
.4byte 0x00000004, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000004
data/contest.s
+1 -1
View File
@@ -12,7 +12,7 @@ gUnknown_08587A70:: @ 8587A70
.align 2
gUnknown_08587A74:: @ 8587A74
obj_tiles gUnknown_08C19450, 0x0020, 0x4e20
obj_tiles gTiles_8C19450, 0x0020, 0x4e20
.align 2
gOamData_8587A7C:: @ 8587A7C
data/easy_chat.s
+5 -5
View File
@@ -299,17 +299,17 @@ gUnknown_08597CA0:: @ 8597CA0
.align 2
gUnknown_08597CC0:: @ 8597CC0
obj_pal gUnknown_08597780, 0x0000
obj_pal gUnknown_08DCB648, 0x0001
obj_pal gUnknown_08DCB86C, 0x0002
obj_pal gEasyChatCursor_Pal, 0x0001
obj_pal gEasyChatRightWindow_Pal, 0x0002
obj_pal gUnknown_085979C0, 0x0003
null_obj_pal
.align 2
gUnknown_08597CE8:: @ 8597CE8
obj_tiles gUnknown_085979E0, 0x0800, 0x0005
obj_tiles gUnknown_08DCB668, 0x1000, 0x0001
obj_tiles gUnknown_08DCB88C, 0x0800, 0x0006
obj_tiles gUnknown_08DCBAB0, 0x1000, 0x0004
obj_tiles gEasyChatCursor_Gfx, 0x1000, 0x0001
obj_tiles gEasyChatRightWindow_Gfx, 0x0800, 0x0006
obj_tiles gEasyChatMode_Gfx, 0x1000, 0x0004
gUnknown_08597D08:: @ 8597D08
.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00
data/graphics.s
+4070 -692
View File
File diff suppressed because it is too large. Load diff
data/graphics/pokemon/icon_palette_indices.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonIconPaletteIndices:: @ 857C388
.byte 0 @ ??????????
.byte 1 @ Bulbasaur
.byte 1 @ Ivysaur
.byte 1 @ Venusaur
.byte 0 @ Charmander
.byte 0 @ Charmeleon
.byte 0 @ Charizard
.byte 0 @ Squirtle
.byte 2 @ Wartortle
.byte 2 @ Blastoise
.byte 1 @ Caterpie
.byte 1 @ Metapod
.byte 0 @ Butterfree
.byte 1 @ Weedle
.byte 2 @ Kakuna
.byte 2 @ Beedrill
.byte 0 @ Pidgey
.byte 0 @ Pidgeotto
.byte 0 @ Pidgeot
.byte 2 @ Rattata
.byte 1 @ Raticate
.byte 0 @ Spearow
.byte 0 @ Fearow
.byte 2 @ Ekans
.byte 2 @ Arbok
.byte 2 @ Pikachu
.byte 0 @ Raichu
.byte 2 @ Sandshrew
.byte 2 @ Sandslash
.byte 2 @ Nidoran♀
.byte 2 @ Nidorina
.byte 2 @ Nidoqueen
.byte 2 @ Nidoran♂
.byte 2 @ Nidorino
.byte 2 @ Nidoking
.byte 0 @ Clefairy
.byte 0 @ Clefable
.byte 2 @ Vulpix
.byte 1 @ Ninetales
.byte 0 @ Jigglypuff
.byte 0 @ Wigglytuff
.byte 2 @ Zubat
.byte 2 @ Golbat
.byte 1 @ Oddish
.byte 0 @ Gloom
.byte 0 @ Vileplume
.byte 0 @ Paras
.byte 0 @ Parasect
.byte 0 @ Venonat
.byte 2 @ Venomoth
.byte 2 @ Diglett
.byte 2 @ Dugtrio
.byte 1 @ Meowth
.byte 1 @ Persian
.byte 1 @ Psyduck
.byte 2 @ Golduck
.byte 1 @ Mankey
.byte 2 @ Primeape
.byte 0 @ Growlithe
.byte 0 @ Arcanine
.byte 0 @ Poliwag
.byte 0 @ Poliwhirl
.byte 0 @ Poliwrath
.byte 2 @ Abra
.byte 2 @ Kadabra
.byte 2 @ Alakazam
.byte 0 @ Machop
.byte 2 @ Machoke
.byte 0 @ Machamp
.byte 1 @ Bellsprout
.byte 1 @ Weepinbell
.byte 1 @ Victreebel
.byte 2 @ Tentacool
.byte 2 @ Tentacruel
.byte 1 @ Geodude
.byte 1 @ Graveler
.byte 1 @ Golem
.byte 0 @ Ponyta
.byte 0 @ Rapidash
.byte 0 @ Slowpoke
.byte 0 @ Slowbro
.byte 0 @ Magnemite
.byte 0 @ Magneton
.byte 1 @ Farfetch'd
.byte 2 @ Doduo
.byte 2 @ Dodrio
.byte 2 @ Seel
.byte 2 @ Dewgong
.byte 2 @ Grimer
.byte 2 @ Muk
.byte 2 @ Shellder
.byte 2 @ Cloyster
.byte 2 @ Gastly
.byte 2 @ Haunter
.byte 2 @ Gengar
.byte 2 @ Onix
.byte 2 @ Drowzee
.byte 1 @ Hypno
.byte 2 @ Krabby
.byte 2 @ Kingler
.byte 0 @ Voltorb
.byte 0 @ Electrode
.byte 0 @ Exeggcute
.byte 1 @ Exeggutor
.byte 1 @ Cubone
.byte 1 @ Marowak
.byte 2 @ Hitmonlee
.byte 2 @ Hitmonchan
.byte 1 @ Lickitung
.byte 2 @ Koffing
.byte 2 @ Weezing
.byte 1 @ Rhyhorn
.byte 1 @ Rhydon
.byte 0 @ Chansey
.byte 0 @ Tangela
.byte 1 @ Kangaskhan
.byte 0 @ Horsea
.byte 0 @ Seadra
.byte 0 @ Goldeen
.byte 0 @ Seaking
.byte 2 @ Staryu
.byte 2 @ Starmie
.byte 0 @ Mr. mime
.byte 1 @ Scyther
.byte 2 @ Jynx
.byte 1 @ Electabuzz
.byte 0 @ Magmar
.byte 2 @ Pinsir
.byte 2 @ Tauros
.byte 0 @ Magikarp
.byte 0 @ Gyarados
.byte 2 @ Lapras
.byte 2 @ Ditto
.byte 2 @ Eevee
.byte 0 @ Vaporeon
.byte 0 @ Jolteon
.byte 0 @ Flareon
.byte 0 @ Porygon
.byte 0 @ Omanyte
.byte 0 @ Omastar
.byte 2 @ Kabuto
.byte 2 @ Kabutops
.byte 0 @ Aerodactyl
.byte 1 @ Snorlax
.byte 0 @ Articuno
.byte 0 @ Zapdos
.byte 0 @ Moltres
.byte 0 @ Dratini
.byte 0 @ Dragonair
.byte 2 @ Dragonite
.byte 2 @ Mewtwo
.byte 0 @ Mew
.byte 1 @ Chikorita
.byte 1 @ Bayleef
.byte 1 @ Meganium
.byte 1 @ Cyndaquil
.byte 1 @ Quilava
.byte 1 @ Typhlosion
.byte 2 @ Totodile
.byte 2 @ Croconaw
.byte 2 @ Feraligatr
.byte 2 @ Sentret
.byte 2 @ Furret
.byte 2 @ Hoothoot
.byte 2 @ Noctowl
.byte 0 @ Ledyba
.byte 0 @ Ledian
.byte 1 @ Spinarak
.byte 0 @ Ariados
.byte 2 @ Crobat
.byte 2 @ Chinchou
.byte 0 @ Lanturn
.byte 0 @ Pichu
.byte 0 @ Cleffa
.byte 1 @ Igglybuff
.byte 2 @ Togepi
.byte 2 @ Togetic
.byte 0 @ Natu
.byte 0 @ Xatu
.byte 2 @ Mareep
.byte 0 @ Flaaffy
.byte 0 @ Ampharos
.byte 1 @ Bellossom
.byte 2 @ Marill
.byte 2 @ Azumarill
.byte 1 @ Sudowoodo
.byte 1 @ Politoed
.byte 1 @ Hoppip
.byte 1 @ Skiploom
.byte 2 @ Jumpluff
.byte 2 @ Aipom
.byte 1 @ Sunkern
.byte 1 @ Sunflora
.byte 1 @ Yanma
.byte 0 @ Wooper
.byte 0 @ Quagsire
.byte 2 @ Espeon
.byte 2 @ Umbreon
.byte 2 @ Murkrow
.byte 0 @ Slowking
.byte 0 @ Misdreavus
.byte 0 @ Unown A
.byte 0 @ Wobbuffet
.byte 1 @ Girafarig
.byte 0 @ Pineco
.byte 2 @ Forretress
.byte 2 @ Dunsparce
.byte 2 @ Gligar
.byte 0 @ Steelix
.byte 0 @ Snubbull
.byte 2 @ Granbull
.byte 0 @ Qwilfish
.byte 0 @ Scizor
.byte 1 @ Shuckle
.byte 2 @ Heracross
.byte 0 @ Sneasel
.byte 0 @ Teddiursa
.byte 2 @ Ursaring
.byte 0 @ Slugma
.byte 0 @ Magcargo
.byte 2 @ Swinub
.byte 2 @ Piloswine
.byte 0 @ Corsola
.byte 0 @ Remoraid
.byte 0 @ Octillery
.byte 0 @ Delibird
.byte 2 @ Mantine
.byte 0 @ Skarmory
.byte 0 @ Houndour
.byte 0 @ Houndoom
.byte 0 @ Kingdra
.byte 0 @ Phanpy
.byte 0 @ Donphan
.byte 0 @ Porygon2
.byte 2 @ Stantler
.byte 1 @ Smeargle
.byte 2 @ Tyrogue
.byte 2 @ Hitmontop
.byte 1 @ Smoochum
.byte 1 @ Elekid
.byte 1 @ Magby
.byte 1 @ Miltank
.byte 1 @ Blissey
.byte 0 @ Raikou
.byte 2 @ Entei
.byte 0 @ Suicune
.byte 1 @ Larvitar
.byte 0 @ Pupitar
.byte 1 @ Tyranitar
.byte 0 @ Lugia
.byte 1 @ Ho-Oh
.byte 1 @ Celebi
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 0 @ ?
.byte 1 @ Treecko
.byte 0 @ Grovyle
.byte 1 @ Sceptile
.byte 0 @ Torchic
.byte 0 @ Combusken
.byte 0 @ Blaziken
.byte 0 @ Mudkip
.byte 0 @ Marshtomp
.byte 0 @ Swampert
.byte 2 @ Poochyena
.byte 2 @ Mightyena
.byte 2 @ Zigzagoon
.byte 2 @ Linoone
.byte 0 @ Wurmple
.byte 2 @ Silcoon
.byte 0 @ Beautifly
.byte 2 @ Cascoon
.byte 1 @ Dustox
.byte 1 @ Lotad
.byte 1 @ Lombre
.byte 1 @ Ludicolo
.byte 1 @ Seedot
.byte 1 @ Nuzleaf
.byte 0 @ Shiftry
.byte 1 @ Nincada
.byte 1 @ Ninjask
.byte 1 @ Shedinja
.byte 2 @ Taillow
.byte 2 @ Swellow
.byte 1 @ Shroomish
.byte 1 @ Breloom
.byte 1 @ Spinda
.byte 0 @ Wingull
.byte 0 @ Pelipper
.byte 2 @ Surskit
.byte 0 @ Masquerain
.byte 2 @ Wailmer
.byte 0 @ Wailord
.byte 0 @ Skitty
.byte 2 @ Delcatty
.byte 1 @ Kecleon
.byte 1 @ Baltoy
.byte 0 @ Claydol
.byte 0 @ Nosepass
.byte 1 @ Torkoal
.byte 2 @ Sableye
.byte 0 @ Barboach
.byte 0 @ Whiscash
.byte 0 @ Luvdisc
.byte 0 @ Corphish
.byte 0 @ Crawdaunt
.byte 2 @ Feebas
.byte 0 @ Milotic
.byte 0 @ Carvanha
.byte 0 @ Sharpedo
.byte 1 @ Trapinch
.byte 1 @ Vibrava
.byte 1 @ Flygon
.byte 2 @ Makuhita
.byte 1 @ Hariyama
.byte 1 @ Electrike
.byte 0 @ Manectric
.byte 1 @ Numel
.byte 0 @ Camerupt
.byte 2 @ Spheal
.byte 2 @ Sealeo
.byte 0 @ Walrein
.byte 1 @ Cacnea
.byte 1 @ Cacturne
.byte 2 @ Snorunt
.byte 0 @ Glalie
.byte 1 @ Lunatone
.byte 0 @ Solrock
.byte 2 @ Azurill
.byte 0 @ Spoink
.byte 2 @ Grumpig
.byte 0 @ Plusle
.byte 0 @ Minun
.byte 2 @ Mawile
.byte 0 @ Meditite
.byte 0 @ Medicham
.byte 0 @ Swablu
.byte 0 @ Altaria
.byte 0 @ Wynaut
.byte 0 @ Duskull
.byte 0 @ Dusclops
.byte 0 @ Roselia
.byte 2 @ Slakoth
.byte 2 @ Vigoroth
.byte 1 @ Slaking
.byte 1 @ Gulpin
.byte 2 @ Swalot
.byte 1 @ Tropius
.byte 0 @ Whismur
.byte 2 @ Loudred
.byte 2 @ Exploud
.byte 0 @ Clamperl
.byte 0 @ Huntail
.byte 0 @ Gorebyss
.byte 0 @ Absol
.byte 0 @ Shuppet
.byte 0 @ Banette
.byte 2 @ Seviper
.byte 0 @ Zangoose
.byte 1 @ Relicanth
.byte 2 @ Aron
.byte 2 @ Lairon
.byte 2 @ Aggron
.byte 0 @ Castform
.byte 0 @ Volbeat
.byte 2 @ Illumise
.byte 2 @ Lileep
.byte 0 @ Cradily
.byte 0 @ Anorith
.byte 0 @ Armaldo
.byte 1 @ Ralts
.byte 1 @ Kirlia
.byte 1 @ Gardevoir
.byte 2 @ Bagon
.byte 2 @ Shelgon
.byte 0 @ Salamence
.byte 0 @ Beldum
.byte 0 @ Metang
.byte 0 @ Metagross
.byte 2 @ Regirock
.byte 2 @ Regice
.byte 2 @ Registeel
.byte 2 @ Kyogre
.byte 0 @ Groudon
.byte 1 @ Rayquaza
.byte 0 @ Latias
.byte 2 @ Latios
.byte 0 @ Jirachi
.byte 0 @ Deoxys
.byte 0 @ Chimecho
.byte 1 @ Egg
.byte 0 @ Unown B
.byte 0 @ Unown C
.byte 0 @ Unown D
.byte 0 @ Unown E
.byte 0 @ Unown F
.byte 0 @ Unown G
.byte 0 @ Unown H
.byte 0 @ Unown I
.byte 0 @ Unown J
.byte 0 @ Unown K
.byte 0 @ Unown L
.byte 0 @ Unown M
.byte 0 @ Unown N
.byte 0 @ Unown O
.byte 0 @ Unown P
.byte 0 @ Unown Q
.byte 0 @ Unown R
.byte 0 @ Unown S
.byte 0 @ Unown T
.byte 0 @ Unown U
.byte 0 @ Unown V
.byte 0 @ Unown W
.byte 0 @ Unown X
.byte 0 @ Unown Y
.byte 0 @ Unown Z
.byte 0 @ Unown Exclamation Mark
.byte 0 @ Unown Question Mark
data/graphics/pokemon/icon_palette_table.inc
-11
View File
@@ -1,11 +0,0 @@
.align 2
gMonIconPaletteTable:: @ 857C540
obj_pal gMonIconPalettes + 0 * 32, 56000
obj_pal gMonIconPalettes + 1 * 32, 56001
obj_pal gMonIconPalettes + 2 * 32, 56002
@ These palettes are actually part of the title screen BG palette and are not
@ used for Pokémon icons.
obj_pal gMonIconPalettes + 3 * 32, 56003
obj_pal gMonIconPalettes + 4 * 32, 56004
obj_pal gMonIconPalettes + 5 * 32, 56005
data/graphics/pokemon/icon_table.inc
-442
View File
@@ -1,442 +0,0 @@
.align 2
gMonIconTable:: @ 857BCA8
.4byte gMonIcon_Bulbasaur
.4byte gMonIcon_Bulbasaur
.4byte gMonIcon_Ivysaur
.4byte gMonIcon_Venusaur
.4byte gMonIcon_Charmander
.4byte gMonIcon_Charmeleon
.4byte gMonIcon_Charizard
.4byte gMonIcon_Squirtle
.4byte gMonIcon_Wartortle
.4byte gMonIcon_Blastoise
.4byte gMonIcon_Caterpie
.4byte gMonIcon_Metapod
.4byte gMonIcon_Butterfree
.4byte gMonIcon_Weedle
.4byte gMonIcon_Kakuna
.4byte gMonIcon_Beedrill
.4byte gMonIcon_Pidgey
.4byte gMonIcon_Pidgeotto
.4byte gMonIcon_Pidgeot
.4byte gMonIcon_Rattata
.4byte gMonIcon_Raticate
.4byte gMonIcon_Spearow
.4byte gMonIcon_Fearow
.4byte gMonIcon_Ekans
.4byte gMonIcon_Arbok
.4byte gMonIcon_Pikachu
.4byte gMonIcon_Raichu
.4byte gMonIcon_Sandshrew
.4byte gMonIcon_Sandslash
.4byte gMonIcon_NidoranF
.4byte gMonIcon_Nidorina
.4byte gMonIcon_Nidoqueen
.4byte gMonIcon_NidoranM
.4byte gMonIcon_Nidorino
.4byte gMonIcon_Nidoking
.4byte gMonIcon_Clefairy
.4byte gMonIcon_Clefable
.4byte gMonIcon_Vulpix
.4byte gMonIcon_Ninetales
.4byte gMonIcon_Jigglypuff
.4byte gMonIcon_Wigglytuff
.4byte gMonIcon_Zubat
.4byte gMonIcon_Golbat
.4byte gMonIcon_Oddish
.4byte gMonIcon_Gloom
.4byte gMonIcon_Vileplume
.4byte gMonIcon_Paras
.4byte gMonIcon_Parasect
.4byte gMonIcon_Venonat
.4byte gMonIcon_Venomoth
.4byte gMonIcon_Diglett
.4byte gMonIcon_Dugtrio
.4byte gMonIcon_Meowth
.4byte gMonIcon_Persian
.4byte gMonIcon_Psyduck
.4byte gMonIcon_Golduck
.4byte gMonIcon_Mankey
.4byte gMonIcon_Primeape
.4byte gMonIcon_Growlithe
.4byte gMonIcon_Arcanine
.4byte gMonIcon_Poliwag
.4byte gMonIcon_Poliwhirl
.4byte gMonIcon_Poliwrath
.4byte gMonIcon_Abra
.4byte gMonIcon_Kadabra
.4byte gMonIcon_Alakazam
.4byte gMonIcon_Machop
.4byte gMonIcon_Machoke
.4byte gMonIcon_Machamp
.4byte gMonIcon_Bellsprout
.4byte gMonIcon_Weepinbell
.4byte gMonIcon_Victreebel
.4byte gMonIcon_Tentacool
.4byte gMonIcon_Tentacruel
.4byte gMonIcon_Geodude
.4byte gMonIcon_Graveler
.4byte gMonIcon_Golem
.4byte gMonIcon_Ponyta
.4byte gMonIcon_Rapidash
.4byte gMonIcon_Slowpoke
.4byte gMonIcon_Slowbro
.4byte gMonIcon_Magnemite
.4byte gMonIcon_Magneton
.4byte gMonIcon_Farfetchd
.4byte gMonIcon_Doduo
.4byte gMonIcon_Dodrio
.4byte gMonIcon_Seel
.4byte gMonIcon_Dewgong
.4byte gMonIcon_Grimer
.4byte gMonIcon_Muk
.4byte gMonIcon_Shellder
.4byte gMonIcon_Cloyster
.4byte gMonIcon_Gastly
.4byte gMonIcon_Haunter
.4byte gMonIcon_Gengar
.4byte gMonIcon_Onix
.4byte gMonIcon_Drowzee
.4byte gMonIcon_Hypno
.4byte gMonIcon_Krabby
.4byte gMonIcon_Kingler
.4byte gMonIcon_Voltorb
.4byte gMonIcon_Electrode
.4byte gMonIcon_Exeggcute
.4byte gMonIcon_Exeggutor
.4byte gMonIcon_Cubone
.4byte gMonIcon_Marowak
.4byte gMonIcon_Hitmonlee
.4byte gMonIcon_Hitmonchan
.4byte gMonIcon_Lickitung
.4byte gMonIcon_Koffing
.4byte gMonIcon_Weezing
.4byte gMonIcon_Rhyhorn
.4byte gMonIcon_Rhydon
.4byte gMonIcon_Chansey
.4byte gMonIcon_Tangela
.4byte gMonIcon_Kangaskhan
.4byte gMonIcon_Horsea
.4byte gMonIcon_Seadra
.4byte gMonIcon_Goldeen
.4byte gMonIcon_Seaking
.4byte gMonIcon_Staryu
.4byte gMonIcon_Starmie
.4byte gMonIcon_Mrmime
.4byte gMonIcon_Scyther
.4byte gMonIcon_Jynx
.4byte gMonIcon_Electabuzz
.4byte gMonIcon_Magmar
.4byte gMonIcon_Pinsir
.4byte gMonIcon_Tauros
.4byte gMonIcon_Magikarp
.4byte gMonIcon_Gyarados
.4byte gMonIcon_Lapras
.4byte gMonIcon_Ditto
.4byte gMonIcon_Eevee
.4byte gMonIcon_Vaporeon
.4byte gMonIcon_Jolteon
.4byte gMonIcon_Flareon
.4byte gMonIcon_Porygon
.4byte gMonIcon_Omanyte
.4byte gMonIcon_Omastar
.4byte gMonIcon_Kabuto
.4byte gMonIcon_Kabutops
.4byte gMonIcon_Aerodactyl
.4byte gMonIcon_Snorlax
.4byte gMonIcon_Articuno
.4byte gMonIcon_Zapdos
.4byte gMonIcon_Moltres
.4byte gMonIcon_Dratini
.4byte gMonIcon_Dragonair
.4byte gMonIcon_Dragonite
.4byte gMonIcon_Mewtwo
.4byte gMonIcon_Mew
.4byte gMonIcon_Chikorita
.4byte gMonIcon_Bayleef
.4byte gMonIcon_Meganium
.4byte gMonIcon_Cyndaquil
.4byte gMonIcon_Quilava
.4byte gMonIcon_Typhlosion
.4byte gMonIcon_Totodile
.4byte gMonIcon_Croconaw
.4byte gMonIcon_Feraligatr
.4byte gMonIcon_Sentret
.4byte gMonIcon_Furret
.4byte gMonIcon_Hoothoot
.4byte gMonIcon_Noctowl
.4byte gMonIcon_Ledyba
.4byte gMonIcon_Ledian
.4byte gMonIcon_Spinarak
.4byte gMonIcon_Ariados
.4byte gMonIcon_Crobat
.4byte gMonIcon_Chinchou
.4byte gMonIcon_Lanturn
.4byte gMonIcon_Pichu
.4byte gMonIcon_Cleffa
.4byte gMonIcon_Igglybuff
.4byte gMonIcon_Togepi
.4byte gMonIcon_Togetic
.4byte gMonIcon_Natu
.4byte gMonIcon_Xatu
.4byte gMonIcon_Mareep
.4byte gMonIcon_Flaaffy
.4byte gMonIcon_Ampharos
.4byte gMonIcon_Bellossom
.4byte gMonIcon_Marill
.4byte gMonIcon_Azumarill
.4byte gMonIcon_Sudowoodo
.4byte gMonIcon_Politoed
.4byte gMonIcon_Hoppip
.4byte gMonIcon_Skiploom
.4byte gMonIcon_Jumpluff
.4byte gMonIcon_Aipom
.4byte gMonIcon_Sunkern
.4byte gMonIcon_Sunflora
.4byte gMonIcon_Yanma
.4byte gMonIcon_Wooper
.4byte gMonIcon_Quagsire
.4byte gMonIcon_Espeon
.4byte gMonIcon_Umbreon
.4byte gMonIcon_Murkrow
.4byte gMonIcon_Slowking
.4byte gMonIcon_Misdreavus
.4byte gMonIcon_UnownA
.4byte gMonIcon_Wobbuffet
.4byte gMonIcon_Girafarig
.4byte gMonIcon_Pineco
.4byte gMonIcon_Forretress
.4byte gMonIcon_Dunsparce
.4byte gMonIcon_Gligar
.4byte gMonIcon_Steelix
.4byte gMonIcon_Snubbull
.4byte gMonIcon_Granbull
.4byte gMonIcon_Qwilfish
.4byte gMonIcon_Scizor
.4byte gMonIcon_Shuckle
.4byte gMonIcon_Heracross
.4byte gMonIcon_Sneasel
.4byte gMonIcon_Teddiursa
.4byte gMonIcon_Ursaring
.4byte gMonIcon_Slugma
.4byte gMonIcon_Magcargo
.4byte gMonIcon_Swinub
.4byte gMonIcon_Piloswine
.4byte gMonIcon_Corsola
.4byte gMonIcon_Remoraid
.4byte gMonIcon_Octillery
.4byte gMonIcon_Delibird
.4byte gMonIcon_Mantine
.4byte gMonIcon_Skarmory
.4byte gMonIcon_Houndour
.4byte gMonIcon_Houndoom
.4byte gMonIcon_Kingdra
.4byte gMonIcon_Phanpy
.4byte gMonIcon_Donphan
.4byte gMonIcon_Porygon2
.4byte gMonIcon_Stantler
.4byte gMonIcon_Smeargle
.4byte gMonIcon_Tyrogue
.4byte gMonIcon_Hitmontop
.4byte gMonIcon_Smoochum
.4byte gMonIcon_Elekid
.4byte gMonIcon_Magby
.4byte gMonIcon_Miltank
.4byte gMonIcon_Blissey
.4byte gMonIcon_Raikou
.4byte gMonIcon_Entei
.4byte gMonIcon_Suicune
.4byte gMonIcon_Larvitar
.4byte gMonIcon_Pupitar
.4byte gMonIcon_Tyranitar
.4byte gMonIcon_Lugia
.4byte gMonIcon_HoOh
.4byte gMonIcon_Celebi
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_QuestionMark
.4byte gMonIcon_Treecko
.4byte gMonIcon_Grovyle
.4byte gMonIcon_Sceptile
.4byte gMonIcon_Torchic
.4byte gMonIcon_Combusken
.4byte gMonIcon_Blaziken
.4byte gMonIcon_Mudkip
.4byte gMonIcon_Marshtomp
.4byte gMonIcon_Swampert
.4byte gMonIcon_Poochyena
.4byte gMonIcon_Mightyena
.4byte gMonIcon_Zigzagoon
.4byte gMonIcon_Linoone
.4byte gMonIcon_Wurmple
.4byte gMonIcon_Silcoon
.4byte gMonIcon_Beautifly
.4byte gMonIcon_Cascoon
.4byte gMonIcon_Dustox
.4byte gMonIcon_Lotad
.4byte gMonIcon_Lombre
.4byte gMonIcon_Ludicolo
.4byte gMonIcon_Seedot
.4byte gMonIcon_Nuzleaf
.4byte gMonIcon_Shiftry
.4byte gMonIcon_Nincada
.4byte gMonIcon_Ninjask
.4byte gMonIcon_Shedinja
.4byte gMonIcon_Taillow
.4byte gMonIcon_Swellow
.4byte gMonIcon_Shroomish
.4byte gMonIcon_Breloom
.4byte gMonIcon_Spinda
.4byte gMonIcon_Wingull
.4byte gMonIcon_Pelipper
.4byte gMonIcon_Surskit
.4byte gMonIcon_Masquerain
.4byte gMonIcon_Wailmer
.4byte gMonIcon_Wailord
.4byte gMonIcon_Skitty
.4byte gMonIcon_Delcatty
.4byte gMonIcon_Kecleon
.4byte gMonIcon_Baltoy
.4byte gMonIcon_Claydol
.4byte gMonIcon_Nosepass
.4byte gMonIcon_Torkoal
.4byte gMonIcon_Sableye
.4byte gMonIcon_Barboach
.4byte gMonIcon_Whiscash
.4byte gMonIcon_Luvdisc
.4byte gMonIcon_Corphish
.4byte gMonIcon_Crawdaunt
.4byte gMonIcon_Feebas
.4byte gMonIcon_Milotic
.4byte gMonIcon_Carvanha
.4byte gMonIcon_Sharpedo
.4byte gMonIcon_Trapinch
.4byte gMonIcon_Vibrava
.4byte gMonIcon_Flygon
.4byte gMonIcon_Makuhita
.4byte gMonIcon_Hariyama
.4byte gMonIcon_Electrike
.4byte gMonIcon_Manectric
.4byte gMonIcon_Numel
.4byte gMonIcon_Camerupt
.4byte gMonIcon_Spheal
.4byte gMonIcon_Sealeo
.4byte gMonIcon_Walrein
.4byte gMonIcon_Cacnea
.4byte gMonIcon_Cacturne
.4byte gMonIcon_Snorunt
.4byte gMonIcon_Glalie
.4byte gMonIcon_Lunatone
.4byte gMonIcon_Solrock
.4byte gMonIcon_Azurill
.4byte gMonIcon_Spoink
.4byte gMonIcon_Grumpig
.4byte gMonIcon_Plusle
.4byte gMonIcon_Minun
.4byte gMonIcon_Mawile
.4byte gMonIcon_Meditite
.4byte gMonIcon_Medicham
.4byte gMonIcon_Swablu
.4byte gMonIcon_Altaria
.4byte gMonIcon_Wynaut
.4byte gMonIcon_Duskull
.4byte gMonIcon_Dusclops
.4byte gMonIcon_Roselia
.4byte gMonIcon_Slakoth
.4byte gMonIcon_Vigoroth
.4byte gMonIcon_Slaking
.4byte gMonIcon_Gulpin
.4byte gMonIcon_Swalot
.4byte gMonIcon_Tropius
.4byte gMonIcon_Whismur
.4byte gMonIcon_Loudred
.4byte gMonIcon_Exploud
.4byte gMonIcon_Clamperl
.4byte gMonIcon_Huntail
.4byte gMonIcon_Gorebyss
.4byte gMonIcon_Absol
.4byte gMonIcon_Shuppet
.4byte gMonIcon_Banette
.4byte gMonIcon_Seviper
.4byte gMonIcon_Zangoose
.4byte gMonIcon_Relicanth
.4byte gMonIcon_Aron
.4byte gMonIcon_Lairon
.4byte gMonIcon_Aggron
.4byte gMonIcon_Castform
.4byte gMonIcon_Volbeat
.4byte gMonIcon_Illumise
.4byte gMonIcon_Lileep
.4byte gMonIcon_Cradily
.4byte gMonIcon_Anorith
.4byte gMonIcon_Armaldo
.4byte gMonIcon_Ralts
.4byte gMonIcon_Kirlia
.4byte gMonIcon_Gardevoir
.4byte gMonIcon_Bagon
.4byte gMonIcon_Shelgon
.4byte gMonIcon_Salamence
.4byte gMonIcon_Beldum
.4byte gMonIcon_Metang
.4byte gMonIcon_Metagross
.4byte gMonIcon_Regirock
.4byte gMonIcon_Regice
.4byte gMonIcon_Registeel
.4byte gMonIcon_Kyogre
.4byte gMonIcon_Groudon
.4byte gMonIcon_Rayquaza
.4byte gMonIcon_Latias
.4byte gMonIcon_Latios
.4byte gMonIcon_Jirachi
.4byte gMonIcon_Deoxys
.4byte gMonIcon_Chimecho
.4byte gMonIcon_Egg
.4byte gMonIcon_UnownB
.4byte gMonIcon_UnownC
.4byte gMonIcon_UnownD
.4byte gMonIcon_UnownE
.4byte gMonIcon_UnownF
.4byte gMonIcon_UnownG
.4byte gMonIcon_UnownH
.4byte gMonIcon_UnownI
.4byte gMonIcon_UnownJ
.4byte gMonIcon_UnownK
.4byte gMonIcon_UnownL
.4byte gMonIcon_UnownM
.4byte gMonIcon_UnownN
.4byte gMonIcon_UnownO
.4byte gMonIcon_UnownP
.4byte gMonIcon_UnownQ
.4byte gMonIcon_UnownR
.4byte gMonIcon_UnownS
.4byte gMonIcon_UnownT
.4byte gMonIcon_UnownU
.4byte gMonIcon_UnownV
.4byte gMonIcon_UnownW
.4byte gMonIcon_UnownX
.4byte gMonIcon_UnownY
.4byte gMonIcon_UnownZ
.4byte gMonIcon_UnownExclamationMark
.4byte gMonIcon_UnownQuestionMark
data/item_menu_icons.s
+17 -2
View File
@@ -1,4 +1,4 @@
#include "constants/items.h"
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -54,7 +54,22 @@ gUnknown_0857FDF4:: @ 857FDF4
.incbin "baserom.gba", 0x57fdf4, 0x1c
gUnknown_0857FE10:: @ 857FE10
.incbin "baserom.gba", 0x57fe10, 0x90
.incbin "baserom.gba", 0x57fe10, 0x18
gUnknown_0857FE28:: @ 857FE28
.incbin "baserom.gba", 0x57fe28, 0x18
gUnknown_0857FE40:: @ 857FE40
.incbin "baserom.gba", 0x57fe40, 0x18
gUnknown_0857FE58:: @ 857FE58
.incbin "baserom.gba", 0x57fe58, 0x18
gUnknown_0857FE70:: @ 857FE70
.incbin "baserom.gba", 0x57fe70, 0x18
gUnknown_0857FE88:: @ 857FE88
.incbin "baserom.gba", 0x57fe88, 0x18
@ 857FEA0
.include "data/text/item_descriptions.inc"
data/party_menu.s
+56 -9
View File
@@ -166,10 +166,51 @@ gUnknown_08615AF1:: @ 8615AF1
.incbin "baserom.gba", 0x615af1, 0x3
gUnknown_08615AF4:: @ 8615AF4
.incbin "baserom.gba", 0x615af4, 0x6c
.4byte gUnknown_085E9E43
.4byte gUnknown_085EA010
.4byte gUnknown_085EA02A
.4byte gUnknown_085E9E55
.4byte gUnknown_085E9E64
.4byte gUnknown_085E9E79
.4byte gUnknown_085E9E8F
.4byte gUnknown_085E9EBC
.4byte gUnknown_085E9ED4
.4byte gUnknown_085E9EE9
.4byte gUnknown_085E9FDB
.4byte gUnknown_085EA046
.4byte gUnknown_085EA05B
.4byte gUnknown_085E9F01
.4byte gUnknown_085E9F58
.4byte gUnknown_085E9F6F
.4byte gUnknown_085E9F81
.4byte gUnknown_085E9F90
.4byte gUnknown_085E9FA7
.4byte gUnknown_085E9FC2
.4byte gText_EmptyString2
.4byte gUnknown_085E9EA6
.4byte gUnknown_085E9F16
.4byte gUnknown_085E9F2A
.4byte gUnknown_085E9F42
.4byte gUnknown_085E9FF9
.4byte gUnknown_085EA073
gUnknown_08615B60:: @ 8615B60
.incbin "baserom.gba", 0x615b60, 0xa8
.4byte gUnknown_085EA091
.4byte gUnknown_085EA099
.4byte gUnknown_085EA09E
.4byte gUnknown_085EA0A4
.4byte gUnknown_085EA0AB
.4byte gUnknown_085EA0E7
.4byte gUnknown_085EA0B1
.4byte gUnknown_085EA0B6
.4byte gUnknown_085EA0BF
.4byte gUnknown_085EA0C5
.4byte gUnknown_085EA0CF
.4byte gUnknown_085EA0D7
.4byte gUnknown_085EA0DC
gUnknown_08615B94:: @ 8615B94
.incbin "baserom.gba", 0x615b94, 0x74
gUnknown_08615C08:: @ 8615C08
.incbin "baserom.gba", 0x615c08, 0x130
@@ -187,22 +228,28 @@ gUnknown_08615D9C:: @ 8615D9C
.incbin "baserom.gba", 0x615d9c, 0x70
gUnknown_08615E0C:: @ 8615E0C
.incbin "baserom.gba", 0x615e0c, 0xa4
.incbin "baserom.gba", 0x615e0c, 0x24
gUnknown_08615E30:: @ 8615E30
.incbin "baserom.gba", 0x615e30, 0x40
gUnknown_08615E70:: @ 8615E70
.incbin "baserom.gba", 0x615e70, 0x40
gUnknown_08615EB0:: @ 8615EB0
.incbin "baserom.gba", 0x615eb0, 0x8
obj_tiles gUnknown_08615E30, 0x40, 55120
gUnknown_08615EB8:: @ 8615EB8
.incbin "baserom.gba", 0x615eb8, 0x8
obj_pal gUnknown_08615E70, 55120
gUnknown_08615EC0:: @ 8615EC0
.incbin "baserom.gba", 0x615ec0, 0x38
gUnknown_08615EF8:: @ 8615EF8
.incbin "baserom.gba", 0x615ef8, 0x8
obj_tiles gPartyMenuPokeball_Gfx, 0x400, 1200
gUnknown_08615F00:: @ 8615F00
.incbin "baserom.gba", 0x615f00, 0x8
obj_pal gPartyMenuPokeball_Pal, 1200
gUnknown_08615F08:: @ 8615F08
.incbin "baserom.gba", 0x615f08, 0x68
@@ -214,10 +261,10 @@ gUnknown_08615F78:: @ 8615F78
.incbin "baserom.gba", 0x615f78, 0x80
gUnknown_08615FF8:: @ 8615FF8
.incbin "baserom.gba", 0x615ff8, 0x8
obj_tiles gStatusGfx_Icons, 0x400, 1202
gUnknown_08616000:: @ 8616000
.incbin "baserom.gba", 0x616000, 0x8
obj_pal gStatusPal_Icons, 1202
gUnknown_08616008:: @ 8616008
.incbin "baserom.gba", 0x616008, 0x18
data/pokedex.s
+144 -65
View File
@@ -1,62 +1,26 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
gUnknown_0855C6A4:: @ 855C6A4
.incbin "baserom.gba", 0x55c6a4, 0x336
.macro unk_dex_struct texts, a2, a3, a4
.4byte \texts
.byte \a2, \a3, \a4
.byte 0 @padding
.endm
gUnknown_0855C9DA:: @ 855C9DA
.incbin "baserom.gba", 0x55c9da, 0x304
.macro unk_dex_struct_2 text, a2, a3, a4, a5, a6, a7
.4byte \text
.byte \a2, \a3, \a4, \a5, \a6, \a7
.2byte 0 @padding
.endm
gUnknown_0855CCDE:: @ 855CCDE
.incbin "baserom.gba", 0x55ccde, 0x4b6
gUnknown_0855D194:: @ 855D194
.incbin "baserom.gba", 0x55d194, 0x18
gUnknown_0855D1AC:: @ 855D1AC
.incbin "baserom.gba", 0x55d1ac, 0x18
gUnknown_0855D1C4:: @ 855D1C4
.incbin "baserom.gba", 0x55d1c4, 0x18
gUnknown_0855D1DC:: @ 855D1DC
.incbin "baserom.gba", 0x55d1dc, 0x18
gUnknown_0855D1F4:: @ 855D1F4
.incbin "baserom.gba", 0x55d1f4, 0x18
gUnknown_0855D20C:: @ 855D20C
.incbin "baserom.gba", 0x55d20c, 0x18
gUnknown_0855D224:: @ 855D224
.incbin "baserom.gba", 0x55d224, 0x18
gUnknown_0855D23C:: @ 855D23C
.incbin "baserom.gba", 0x55d23c, 0x18
gUnknown_0855D254:: @ 855D254
.incbin "baserom.gba", 0x55d254, 0x18
gUnknown_0855D26C:: @ 855D26C
.incbin "baserom.gba", 0x55d26c, 0x10
gUnknown_0855D27C:: @ 855D27C
.incbin "baserom.gba", 0x55d27c, 0x10
gUnknown_0855D28C:: @ 855D28C
.incbin "baserom.gba", 0x55d28c, 0x5
gUnknown_0855D291:: @ 855D291
.incbin "baserom.gba", 0x55d291, 0x7
gUnknown_0855D298:: @ 855D298
.incbin "baserom.gba", 0x55d298, 0x10
gUnknown_0855D2A8:: @ 855D2A8
.incbin "baserom.gba", 0x55d2a8, 0x10
.macro unk_dex_struct_3 text, a2, a3, a4
.4byte \text
.byte \a2, \a3, \a4
.byte 0 @padding
.endm
gUnknown_0855D2B8:: @ 855D2B8
.incbin "baserom.gba", 0x55d2b8, 0x6
@@ -64,8 +28,10 @@ gUnknown_0855D2B8:: @ 855D2B8
gUnknown_0855D2BE:: @ 855D2BE
.incbin "baserom.gba", 0x55d2be, 0x40
gUnknown_0855D2FE:: @ 855D2FE
.incbin "baserom.gba", 0x55d2fe, 0xe
sText_TenDashes:: @ 855D2FE
.string "----------$"
.align 2
gUnknown_0855D30C:: @ 855D30C
.string "$"
@@ -101,10 +67,18 @@ gUnknown_0856ED08:: @ 856ED08
.incbin "baserom.gba", 0x56ed08, 0x28
gUnknown_0856ED30:: @ 856ED30
.incbin "baserom.gba", 0x56ed30, 0x18
unk_dex_struct_3 gUnknown_085E87A5, 0, 0, 5
unk_dex_struct_3 gUnknown_085E87D6, 6, 0, 5
unk_dex_struct_3 gUnknown_085E87EF, 12, 0, 5
gUnknown_0856ED48:: @ 856ED48
.incbin "baserom.gba", 0x56ed48, 0x54
unk_dex_struct_2 gUnknown_085E8840, 0, 2, 5, 5, 2, 12
unk_dex_struct_2 gUnknown_085E887C, 0, 4, 5, 5, 4, 12
unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 5, 6, 6
unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 11, 6, 6
unk_dex_struct_2 gUnknown_085E881F, 0, 8, 5, 5, 8, 12
unk_dex_struct_2 gUnknown_085E8806, 0, 10, 5, 5, 10, 12
unk_dex_struct_2 gUnknown_085E88C8, 0, 12, 5, 0, 0, 0
gUnknown_0856ED9C:: @ 856ED9C
.incbin "baserom.gba", 0x56ed9c, 0x1c
@@ -119,19 +93,119 @@ gUnknown_0856EDF0:: @ 856EDF0
.incbin "baserom.gba", 0x56edf0, 0x1c
gUnknown_0856EE0C:: @ 856EE0C
.incbin "baserom.gba", 0x56ee0c, 0x18
.4byte gUnknown_085E89A4
.4byte gUnknown_085E88DF
.4byte gUnknown_085E89BB
.4byte gUnknown_085E88E9
.4byte NULL
.4byte NULL
gUnknown_0856EE24:: @ 856EE24
.incbin "baserom.gba", 0x56ee24, 0x38
.4byte gUnknown_085E89D4
.4byte gUnknown_085E88F6
.4byte gUnknown_085E8A02
.4byte gUnknown_085E8905
.4byte gUnknown_085E8A37
.4byte gUnknown_085E8911
.4byte gUnknown_085E8A73
.4byte gUnknown_085E891F
.4byte gUnknown_085E8AAF
.4byte gUnknown_085E892D
.4byte gUnknown_085E8AEA
.4byte gUnknown_085E893A
.4byte 0
.4byte 0
gUnknown_0856EE5C:: @ 856EE5C
.incbin "baserom.gba", 0x56ee5c, 0x58
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8B26
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8948
.4byte gUnknown_085E8B25
.4byte gUnknown_085E894C
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8950
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8954
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8958
.4byte gUnknown_085E8B25
.4byte gUnknown_085E895C
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8960
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8964
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8968
.4byte 0
.4byte 0
gUnknown_0856EEB4:: @ 856EEB4
.incbin "baserom.gba", 0x56eeb4, 0x60
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8B26
.4byte gUnknown_085E8B25
.4byte gUnknown_085E896B
.4byte gUnknown_085E8B25
.4byte gUnknown_085E896F
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8974
.4byte gUnknown_085E8B25
.4byte gUnknown_085E897B
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8981
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8987
.4byte gUnknown_085E8B25
.4byte gUnknown_085E898D
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8994
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8999
.4byte gUnknown_085E8B25
.4byte gUnknown_085E899F
.4byte 0
.4byte 0
@ read from type table for each type except ???, entry is 7 byte of length
gUnknown_0856EF14:: @ 856EF14
.incbin "baserom.gba", 0x56ef14, 0x98
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8B35
.4byte gUnknown_085E8B25
.4byte gTypeNames + 0
.4byte gUnknown_085E8B25
.4byte gTypeNames + 7
.4byte gUnknown_085E8B25
.4byte gTypeNames + 14
.4byte gUnknown_085E8B25
.4byte gTypeNames + 21
.4byte gUnknown_085E8B25
.4byte gTypeNames + 28
.4byte gUnknown_085E8B25
.4byte gTypeNames + 35
.4byte gUnknown_085E8B25
.4byte gTypeNames + 42
.4byte gUnknown_085E8B25
.4byte gTypeNames + 49
.4byte gUnknown_085E8B25
.4byte gTypeNames + 56
.4byte gUnknown_085E8B25
.4byte gTypeNames + 70
.4byte gUnknown_085E8B25
.4byte gTypeNames + 77
.4byte gUnknown_085E8B25
.4byte gTypeNames + 84
.4byte gUnknown_085E8B25
.4byte gTypeNames + 91
.4byte gUnknown_085E8B25
.4byte gTypeNames + 98
.4byte gUnknown_085E8B25
.4byte gTypeNames + 105
.4byte gUnknown_085E8B25
.4byte gTypeNames + 112
.4byte gUnknown_085E8B25
.4byte gTypeNames + 119
.4byte 0
.4byte 0
gUnknown_0856EFAC:: @ 856EFAC
.incbin "baserom.gba", 0x56efac, 0x2
@@ -143,7 +217,12 @@ gUnknown_0856EFB4:: @ 856EFB4
.incbin "baserom.gba", 0x56efb4, 0x14
gUnknown_0856EFC8:: @ 856EFC8
.incbin "baserom.gba", 0x56efc8, 0x30
unk_dex_struct gUnknown_0856EE5C, 6, 7, 10
unk_dex_struct gUnknown_0856EEB4, 8, 9, 11
unk_dex_struct gUnknown_0856EF14, 10,11, 18
unk_dex_struct gUnknown_0856EF14, 12, 13, 18
unk_dex_struct gUnknown_0856EE24, 4, 5, 6
unk_dex_struct gUnknown_0856EE0C, 2, 3, 2
gUnknown_0856EFF8:: @ 856EFF8
.incbin "baserom.gba", 0x56eff8, 0x10
data/pokedex_area_screen.s
+1 -1
View File
@@ -79,7 +79,7 @@ AreaMarkerTiles:: @ 85B406C
.align 2
gUnknown_085B40EC:: @ 85B40EC
obj_pal gUnknown_08DC4120, 0x0003
obj_pal gPokedexAreaScreenAreaUnknown_Pal, 0x0003
.align 2
gOamData_85B40F4:: @ 85B40F4
data/pokedex_entries.inc
+230 -230
View File
@@ -1,11 +1,11 @@
.align 2
gPokedexEntries:: @ 856B5B0
.string "UNKNOWN$", 12
pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0
pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0
.string "SEED$", 12
pokedex_entry 7, 69, gBulbasaurPokedexText, 356, 17, 256, 0
.string "SEED$", 12
pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0
pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0
.string "SEED$", 12
pokedex_entry 20, 1000, gVenusaurPokedexText, 256, 0, 388, 6
.string "LIZARD$", 12
@@ -23,37 +23,37 @@ gPokedexEntries:: @ 856B5B0
.string "WORM$", 12
pokedex_entry 3, 29, gCaterpiePokedexText, 549, 22, 256, 0
.string "COCOON$", 12
pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0
pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0
.string "BUTTERFLY$", 12
pokedex_entry 11, 320, gButterfreePokedexText, 312, 2, 256, 0
.string "HAIRY BUG$", 12
pokedex_entry 3, 32, gWeedlePokedexText, 455, 22, 256, 0
pokedex_entry 3, 32, gWeedlePokedexText, 455, 22, 256, 0
.string "COCOON$", 12
pokedex_entry 6, 100, gKakunaPokedexText, 424, 17, 256, 0
pokedex_entry 6, 100, gKakunaPokedexText, 424, 17, 256, 0
.string "POISON BEE$", 12
pokedex_entry 10, 295, gBeedrillPokedexText, 366, 2, 256, 0
.string "TINY BIRD$", 12
pokedex_entry 3, 18, gPidgeyPokedexText, 508, -3, 256, 0
pokedex_entry 3, 18, gPidgeyPokedexText, 508, -3, 256, 0
.string "BIRD$", 12
pokedex_entry 11, 300, gPidgeottoPokedexText, 331, 10, 256, 0
.string "BIRD$", 12
pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0
pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0
.string "MOUSE$", 12
pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0
pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0
.string "MOUSE$", 12
pokedex_entry 7, 185, gRaticatePokedexText, 459, 18, 256, 0
.string "TINY BIRD$", 12
pokedex_entry 3, 20, gSpearowPokedexText, 571, 22, 256, 0
pokedex_entry 3, 20, gSpearowPokedexText, 571, 22, 256, 0
.string "BEAK$", 12
pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0
pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0
.string "SNAKE$", 12
pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0
pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0
.string "COBRA$", 12
pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2
pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2
.string "MOUSE$", 12
pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0
pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0
.string "MOUSE$", 12
pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0
pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0
.string "MOUSE$", 12
pokedex_entry 6, 120, gSandshrewPokedexText, 365, 18, 256, 0
.string "MOUSE$", 12
@@ -75,7 +75,7 @@ gPokedexEntries:: @ 856B5B0
.string "FAIRY$", 12
pokedex_entry 13, 400, gClefablePokedexText, 256, 5, 256, 0
.string "FOX$", 12
pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0
pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0
.string "FOX$", 12
pokedex_entry 11, 199, gNinetalesPokedexText, 339, 10, 256, 0
.string "BALLOON$", 12
@@ -83,37 +83,37 @@ gPokedexEntries:: @ 856B5B0
.string "BALLOON$", 12
pokedex_entry 10, 120, gWigglytuffPokedexText, 328, 11, 256, 0
.string "BAT$", 12
pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0
pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0
.string "BAT$", 12
pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0
pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0
.string "WEED$", 12
pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0
pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0
.string "WEED$", 12
pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0
pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0
.string "FLOWER$", 12
pokedex_entry 12, 186, gVileplumePokedexText, 256, 4, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0
pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 10, 295, gParasectPokedexText, 307, 8, 256, 0
.string "INSECT$", 12
pokedex_entry 10, 300, gVenonatPokedexText, 360, 0, 256, -1
pokedex_entry 10, 300, gVenonatPokedexText, 360, 0, 256, -1
.string "POISON MOTH$", 12
pokedex_entry 15, 125, gVenomothPokedexText, 285, 2, 256, 1
.string "MOLE$", 12
pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0
pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0
.string "MOLE$", 12
pokedex_entry 7, 333, gDugtrioPokedexText, 406, 18, 256, 0
pokedex_entry 7, 333, gDugtrioPokedexText, 406, 18, 256, 0
.string "SCRATCH CAT$", 12
pokedex_entry 4, 42, gMeowthPokedexText, 480, 19, 256, 0
pokedex_entry 4, 42, gMeowthPokedexText, 480, 19, 256, 0
.string "CLASSY CAT$", 12
pokedex_entry 10, 320, gPersianPokedexText, 320, 10, 256, 0
pokedex_entry 10, 320, gPersianPokedexText, 320, 10, 256, 0
.string "DUCK$", 12
pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0
pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0
.string "DUCK$", 12
pokedex_entry 17, 766, gGolduckPokedexText, 256, 1, 273, 1
pokedex_entry 17, 766, gGolduckPokedexText, 256, 1, 273, 1
.string "PIG MONKEY$", 12
pokedex_entry 5, 280, gMankeyPokedexText, 404, 19, 256, 0
pokedex_entry 5, 280, gMankeyPokedexText, 404, 19, 256, 0
.string "PIG MONKEY$", 12
pokedex_entry 10, 320, gPrimeapePokedexText, 326, 10, 256, 0
.string "PUPPY$", 12
@@ -121,23 +121,23 @@ gPokedexEntries:: @ 856B5B0
.string "LEGENDARY$", 12
pokedex_entry 19, 1550, gArcaninePokedexText, 256, 1, 312, 4
.string "TADPOLE$", 12
pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0
pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0
.string "TADPOLE$", 12
pokedex_entry 10, 200, gPoliwhirlPokedexText, 288, 11, 256, 0
.string "TADPOLE$", 12
pokedex_entry 13, 540, gPoliwrathPokedexText, 256, 6, 256, 0
.string "PSI$", 12
pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0
pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0
.string "PSI$", 12
pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0
pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0
.string "PSI$", 12
pokedex_entry 15, 480, gAlakazamPokedexText, 256, 3, 256, 0
.string "SUPERPOWER$", 12
pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0
pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0
.string "SUPERPOWER$", 12
pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0
pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0
.string "SUPERPOWER$", 12
pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1
pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1
.string "FLOWER$", 12
pokedex_entry 7, 40, gBellsproutPokedexText, 354, 16, 256, 0
.string "FLYCATCHER$", 12
@@ -149,19 +149,19 @@ gPokedexEntries:: @ 856B5B0
.string "JELLYFISH$", 12
pokedex_entry 16, 550, gTentacruelPokedexText, 256, 0, 312, 1
.string "ROCK$", 12
pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0
pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0
.string "ROCK$", 12
pokedex_entry 10, 1050, gGravelerPokedexText, 256, 2, 256, 0
.string "MEGATON$", 12
pokedex_entry 14, 3000, gGolemPokedexText, 256, 3, 296, 2
pokedex_entry 14, 3000, gGolemPokedexText, 256, 3, 296, 2
.string "FIRE HORSE$", 12
pokedex_entry 10, 300, gPonytaPokedexText, 283, 8, 256, 0
pokedex_entry 10, 300, gPonytaPokedexText, 283, 8, 256, 0
.string "FIRE HORSE$", 12
pokedex_entry 17, 950, gRapidashPokedexText, 256, 0, 289, 1
.string "DOPEY$", 12
pokedex_entry 12, 360, gSlowpokePokedexText, 256, 10, 256, 0
.string "HERMIT CRAB$", 12
pokedex_entry 16, 785, gSlowbroPokedexText, 256, 6, 296, 2
pokedex_entry 16, 785, gSlowbroPokedexText, 256, 6, 296, 2
.string "MAGNET$", 12
pokedex_entry 3, 60, gMagnemitePokedexText, 288, -9, 256, 0
.string "MAGNET$", 12
@@ -169,39 +169,39 @@ gPokedexEntries:: @ 856B5B0
.string "WILD DUCK$", 12
pokedex_entry 8, 150, gFarfetchdPokedexText, 330, 2, 293, 2
.string "TWIN BIRD$", 12
pokedex_entry 14, 392, gDoduoPokedexText, 256, 3, 257, -1
pokedex_entry 14, 392, gDoduoPokedexText, 256, 3, 257, -1
.string "TRIPLE BIRD$", 12
pokedex_entry 18, 852, gDodrioPokedexText, 256, 0, 268, 0
pokedex_entry 18, 852, gDodrioPokedexText, 256, 0, 268, 0
.string "SEA LION$", 12
pokedex_entry 11, 900, gSeelPokedexText, 297, 8, 256, 0
pokedex_entry 11, 900, gSeelPokedexText, 297, 8, 256, 0
.string "SEA LION$", 12
pokedex_entry 17, 1200, gDewgongPokedexText, 256, 0, 275, 0
pokedex_entry 17, 1200, gDewgongPokedexText, 256, 0, 275, 0
.string "SLUDGE$", 12
pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0
pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0
.string "SLUDGE$", 12
pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0
pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0
.string "BIVALVE$", 12
pokedex_entry 3, 40, gShellderPokedexText, 675, 24, 256, 0
.string "BIVALVE$", 12
pokedex_entry 15, 1325, gCloysterPokedexText, 256, 0, 269, 1
.string "GAS$", 12
pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0
pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0
.string "GAS$", 12
pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2
pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2
.string "SHADOW$", 12
pokedex_entry 15, 405, gGengarPokedexText, 256, 2, 302, 2
pokedex_entry 15, 405, gGengarPokedexText, 256, 2, 302, 2
.string "ROCK SNAKE$", 12
pokedex_entry 88, 2100, gOnixPokedexText, 256, 1, 515, 14
pokedex_entry 88, 2100, gOnixPokedexText, 256, 1, 515, 14
.string "HYPNOSIS$", 12
pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0
pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0
.string "HYPNOSIS$", 12
pokedex_entry 16, 756, gHypnoPokedexText, 256, 3, 257, 0
pokedex_entry 16, 756, gHypnoPokedexText, 256, 3, 257, 0
.string "RIVER CRAB$", 12
pokedex_entry 4, 65, gKrabbyPokedexText, 469, 20, 256, 0
pokedex_entry 4, 65, gKrabbyPokedexText, 469, 20, 256, 0
.string "PINCER$", 12
pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0
pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0
.string "BALL$", 12
pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0
pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0
.string "BALL$", 12
pokedex_entry 12, 666, gElectrodePokedexText, 256, 0, 256, 0
.string "EGG$", 12
@@ -209,9 +209,9 @@ gPokedexEntries:: @ 856B5B0
.string "COCONUT$", 12
pokedex_entry 20, 1200, gExeggutorPokedexText, 256, 0, 309, 5
.string "LONELY$", 12
pokedex_entry 4, 65, gCubonePokedexText, 545, 21, 256, 0
pokedex_entry 4, 65, gCubonePokedexText, 545, 21, 256, 0
.string "BONE KEEPER$", 12
pokedex_entry 10, 450, gMarowakPokedexText, 293, 12, 256, 0
pokedex_entry 10, 450, gMarowakPokedexText, 293, 12, 256, 0
.string "KICKING$", 12
pokedex_entry 15, 498, gHitmonleePokedexText, 256, 3, 259, 1
.string "PUNCHING$", 12
@@ -219,101 +219,101 @@ gPokedexEntries:: @ 856B5B0
.string "LICKING$", 12
pokedex_entry 12, 655, gLickitungPokedexText, 256, 4, 256, 0
.string "POISON GAS$", 12
pokedex_entry 6, 10, gKoffingPokedexText, 369, -1, 256, 0
pokedex_entry 6, 10, gKoffingPokedexText, 369, -1, 256, 0
.string "POISON GAS$", 12
pokedex_entry 12, 95, gWeezingPokedexText, 305, 3, 256, 0
pokedex_entry 12, 95, gWeezingPokedexText, 305, 3, 256, 0
.string "SPIKES$", 12
pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0
pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0
.string "DRILL$", 12
pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2
pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2
.string "EGG$", 12
pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0
pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0
.string "VINE$", 12
pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0
pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0
.string "PARENT$", 12
pokedex_entry 22, 800, gKangaskhanPokedexText, 256, 0, 387, 8
.string "DRAGON$", 12
pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0
pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0
.string "DRAGON$", 12
pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0
pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0
.string "GOLDFISH$", 12
pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0
pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0
.string "GOLDFISH$", 12
pokedex_entry 13, 390, gSeakingPokedexText, 256, 3, 256, 0
pokedex_entry 13, 390, gSeakingPokedexText, 256, 3, 256, 0
.string "STAR SHAPE$", 12
pokedex_entry 8, 345, gStaryuPokedexText, 326, 1, 256, 0
pokedex_entry 8, 345, gStaryuPokedexText, 326, 1, 256, 0
.string "MYSTERIOUS$", 12
pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0
pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0
.string "BARRIER$", 12
pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0
pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0
.string "MANTIS$", 12
pokedex_entry 15, 560, gScytherPokedexText, 256, 1, 293, 2
pokedex_entry 15, 560, gScytherPokedexText, 256, 1, 293, 2
.string "HUMAN SHAPE$", 12
pokedex_entry 14, 406, gJynxPokedexText, 256, 3, 300, 1
pokedex_entry 14, 406, gJynxPokedexText, 256, 3, 300, 1
.string "ELECTRIC$", 12
pokedex_entry 11, 300, gElectabuzzPokedexText, 351, 8, 256, 0
.string "SPITFIRE$", 12
pokedex_entry 13, 445, gMagmarPokedexText, 277, 5, 256, 0
pokedex_entry 13, 445, gMagmarPokedexText, 277, 5, 256, 0
.string "STAG BEETLE$", 12
pokedex_entry 15, 550, gPinsirPokedexText, 256, 2, 257, 0
pokedex_entry 15, 550, gPinsirPokedexText, 256, 2, 257, 0
.string "WILD BULL$", 12
pokedex_entry 14, 884, gTaurosPokedexText, 256, 0, 256, 0
pokedex_entry 14, 884, gTaurosPokedexText, 256, 0, 256, 0
.string "FISH$", 12
pokedex_entry 9, 100, gMagikarpPokedexText, 310, 4, 256, 0
.string "ATROCIOUS$", 12
pokedex_entry 65, 2350, gGyaradosPokedexText, 256, 6, 481, 13
.string "TRANSPORT$", 12
pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8
pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8
.string "TRANSFORM$", 12
pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0
pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0
.string "EVOLUTION$", 12
pokedex_entry 3, 65, gEeveePokedexText, 476, 18, 256, 0
pokedex_entry 3, 65, gEeveePokedexText, 476, 18, 256, 0
.string "BUBBLE JET$", 12
pokedex_entry 10, 290, gVaporeonPokedexText, 316, 8, 256, 0
.string "LIGHTNING$", 12
pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0
pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0
.string "FLAME$", 12
pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0
pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0
.string "VIRTUAL$", 12
pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0
pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0
.string "SPIRAL$", 12
pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0
pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0
.string "SPIRAL$", 12
pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0
pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0
.string "SHELLFISH$", 12
pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0
pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0
.string "SHELLFISH$", 12
pokedex_entry 13, 405, gKabutopsPokedexText, 271, 3, 256, 0
.string "FOSSIL$", 12
pokedex_entry 18, 590, gAerodactylPokedexText, 256, 0, 302, 4
.string "SLEEPING$", 12
pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11
pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11
.string "FREEZE$", 12
pokedex_entry 17, 554, gArticunoPokedexText, 256, 0, 309, 2
.string "ELECTRIC$", 12
pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3
pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3
.string "FLAME$", 12
pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8
pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8
.string "DRAGON$", 12
pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6
pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6
.string "DRAGON$", 12
pokedex_entry 40, 165, gDragonairPokedexText, 256, 0, 411, 5
.string "DRAGON$", 12
pokedex_entry 22, 2100, gDragonitePokedexText, 256, 0, 309, 4
.string "GENETIC$", 12
pokedex_entry 20, 1220, gMewtwoPokedexText, 256, 0, 309, 4
pokedex_entry 20, 1220, gMewtwoPokedexText, 256, 0, 309, 4
.string "NEW SPECIES$", 12
pokedex_entry 4, 40, gMewPokedexText, 457, -2, 256, 0
pokedex_entry 4, 40, gMewPokedexText, 457, -2, 256, 0
.string "LEAF$", 12
pokedex_entry 9, 64, gChikoritaPokedexText, 512, 20, 256, 0
.string "LEAF$", 12
pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0
pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0
.string "HERB$", 12
pokedex_entry 18, 1005, gMeganiumPokedexText, 256, 0, 277, 1
.string "FIRE MOUSE$", 12
pokedex_entry 5, 79, gCyndaquilPokedexText, 539, 21, 256, 0
.string "VOLCANO$", 12
pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0
pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0
.string "VOLCANO$", 12
pokedex_entry 17, 795, gTyphlosionPokedexText, 256, 0, 268, 1
.string "BIG JAW$", 12
@@ -323,51 +323,51 @@ gPokedexEntries:: @ 856B5B0
.string "BIG JAW$", 12
pokedex_entry 23, 888, gFeraligatrPokedexText, 256, 0, 342, 7
.string "SCOUT$", 12
pokedex_entry 8, 60, gSentretPokedexText, 439, 12, 256, 0
pokedex_entry 8, 60, gSentretPokedexText, 439, 12, 256, 0
.string "LONG BODY$", 12
pokedex_entry 18, 325, gFurretPokedexText, 346, 11, 256, 0
pokedex_entry 18, 325, gFurretPokedexText, 346, 11, 256, 0
.string "OWL$", 12
pokedex_entry 7, 212, gHoothootPokedexText, 380, -2, 256, 0
.string "OWL$", 12
pokedex_entry 16, 408, gNoctowlPokedexText, 278, 3, 256, 0
pokedex_entry 16, 408, gNoctowlPokedexText, 278, 3, 256, 0
.string "FIVE STAR$", 12
pokedex_entry 10, 108, gLedybaPokedexText, 256, 4, 256, 0
pokedex_entry 10, 108, gLedybaPokedexText, 256, 4, 256, 0
.string "FIVE STAR$", 12
pokedex_entry 14, 356, gLedianPokedexText, 256, 2, 256, 0
pokedex_entry 14, 356, gLedianPokedexText, 256, 2, 256, 0
.string "STRING SPIT$", 12
pokedex_entry 5, 85, gSpinarakPokedexText, 414, 21, 256, 0
.string "LONG LEG$", 12
pokedex_entry 11, 335, gAriadosPokedexText, 316, 8, 256, 0
pokedex_entry 11, 335, gAriadosPokedexText, 316, 8, 256, 0
.string "BAT$", 12
pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1
pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1
.string "ANGLER$", 12
pokedex_entry 5, 120, gChinchouPokedexText, 424, -2, 256, 0
.string "LIGHT$", 12
pokedex_entry 12, 225, gLanturnPokedexText, 269, 6, 256, 0
pokedex_entry 12, 225, gLanturnPokedexText, 269, 6, 256, 0
.string "TINY MOUSE$", 12
pokedex_entry 3, 20, gPichuPokedexText, 508, 20, 256, 0
pokedex_entry 3, 20, gPichuPokedexText, 508, 20, 256, 0
.string "STAR SHAPE$", 12
pokedex_entry 3, 30, gCleffaPokedexText, 462, 23, 256, 0
pokedex_entry 3, 30, gCleffaPokedexText, 462, 23, 256, 0
.string "BALLOON$", 12
pokedex_entry 3, 10, gIgglybuffPokedexText, 457, -1, 256, 0
.string "SPIKE BALL$", 12
pokedex_entry 3, 15, gTogepiPokedexText, 507, 23, 256, 0
pokedex_entry 3, 15, gTogepiPokedexText, 507, 23, 256, 0
.string "HAPPINESS$", 12
pokedex_entry 6, 32, gTogeticPokedexText, 424, 17, 256, 0
pokedex_entry 6, 32, gTogeticPokedexText, 424, 17, 256, 0
.string "TINY BIRD$", 12
pokedex_entry 2, 20, gNatuPokedexText, 610, 25, 256, 0
pokedex_entry 2, 20, gNatuPokedexText, 610, 25, 256, 0
.string "MYSTIC$", 12
pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4
pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4
.string "WOOL$", 12
pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0
pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0
.string "WOOL$", 12
pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0
pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0
.string "LIGHT$", 12
pokedex_entry 14, 615, gAmpharosPokedexText, 256, 4, 256, 0
.string "FLOWER$", 12
pokedex_entry 4, 58, gBellossomPokedexText, 472, 21, 256, 0
.string "AQUA MOUSE$", 12
pokedex_entry 4, 85, gMarillPokedexText, 476, 20, 256, 0
pokedex_entry 4, 85, gMarillPokedexText, 476, 20, 256, 0
.string "AQUA RABBIT$", 12
pokedex_entry 8, 285, gAzumarillPokedexText, 448, 16, 256, 0
.string "IMITATION$", 12
@@ -375,49 +375,49 @@ gPokedexEntries:: @ 856B5B0
.string "FROG$", 12
pokedex_entry 11, 339, gPolitoedPokedexText, 289, 6, 256, 0
.string "COTTONWEED$", 12
pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0
pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0
.string "COTTONWEED$", 12
pokedex_entry 6, 10, gSkiploomPokedexText, 387, 0, 256, 0
.string "COTTONWEED$", 12
pokedex_entry 8, 30, gJumpluffPokedexText, 418, -4, 256, 0
.string "LONG TAIL$", 12
pokedex_entry 8, 115, gAipomPokedexText, 363, 6, 256, 0
pokedex_entry 8, 115, gAipomPokedexText, 363, 6, 256, 0
.string "SEED$", 12
pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0
pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0
.string "SUN$", 12
pokedex_entry 8, 85, gSunfloraPokedexText, 444, 15, 256, 0
.string "CLEAR WING$", 12
pokedex_entry 12, 380, gYanmaPokedexText, 274, -1, 256, 0
pokedex_entry 12, 380, gYanmaPokedexText, 274, -1, 256, 0
.string "WATER FISH$", 12
pokedex_entry 4, 85, gWooperPokedexText, 479, 21, 256, 0
pokedex_entry 4, 85, gWooperPokedexText, 479, 21, 256, 0
.string "WATER FISH$", 12
pokedex_entry 14, 750, gQuagsirePokedexText, 256, 4, 256, 0
.string "SUN$", 12
pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0
pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0
.string "MOONLIGHT$", 12
pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0
pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0
.string "DARKNESS$", 12
pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1
pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1
.string "ROYAL$", 12
pokedex_entry 20, 795, gSlowkingPokedexText, 256, 0, 309, 5
.string "SCREECH$", 12
pokedex_entry 7, 10, gMisdreavusPokedexText, 407, -8, 256, 0
.string "SYMBOL$", 12
pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0
pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0
.string "PATIENT$", 12
pokedex_entry 13, 285, gWobbuffetPokedexText, 274, 4, 256, 0
.string "LONG NECK$", 12
pokedex_entry 15, 415, gGirafarigPokedexText, 281, 1, 256, 0
.string "BAGWORM$", 12
pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0
pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0
.string "BAGWORM$", 12
pokedex_entry 12, 1258, gForretressPokedexText, 293, 5, 256, 0
.string "LAND SNAKE$", 12
pokedex_entry 15, 140, gDunsparcePokedexText, 316, 17, 256, 0
.string "FLYSCORPION$", 12
pokedex_entry 11, 648, gGligarPokedexText, 350, -1, 256, 0
pokedex_entry 11, 648, gGligarPokedexText, 350, -1, 256, 0
.string "IRON SNAKE$", 12
pokedex_entry 92, 4000, gSteelixPokedexText, 256, 0, 516, 13
pokedex_entry 92, 4000, gSteelixPokedexText, 256, 0, 516, 13
.string "FAIRY$", 12
pokedex_entry 6, 78, gSnubbullPokedexText, 465, 19, 256, 0
.string "FAIRY$", 12
@@ -425,27 +425,27 @@ gPokedexEntries:: @ 856B5B0
.string "BALLOON$", 12
pokedex_entry 5, 39, gQwilfishPokedexText, 430, 0, 256, 0
.string "PINCER$", 12
pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0
pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0
.string "MOLD$", 12
pokedex_entry 6, 205, gShucklePokedexText, 485, 18, 256, 0
pokedex_entry 6, 205, gShucklePokedexText, 485, 18, 256, 0
.string "SINGLE HORN$", 12
pokedex_entry 15, 540, gHeracrossPokedexText, 256, 0, 256, 0
.string "SHARP CLAW$", 12
pokedex_entry 9, 280, gSneaselPokedexText, 413, -3, 256, 0
pokedex_entry 9, 280, gSneaselPokedexText, 413, -3, 256, 0
.string "LITTLE BEAR$", 12
pokedex_entry 6, 88, gTeddiursaPokedexText, 455, 19, 256, 0
.string "HIBERNATOR$", 12
pokedex_entry 18, 1258, gUrsaringPokedexText, 256, 0, 256, 0
.string "LAVA$", 12
pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0
pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0
.string "LAVA$", 12
pokedex_entry 8, 550, gMagcargoPokedexText, 332, 15, 256, 0
.string "PIG$", 12
pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0
pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0
.string "SWINE$", 12
pokedex_entry 11, 558, gPiloswinePokedexText, 306, 10, 256, 0
.string "CORAL$", 12
pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0
pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0
.string "JET$", 12
pokedex_entry 6, 120, gRemoraidPokedexText, 316, 4, 256, 0
.string "JET$", 12
@@ -453,7 +453,7 @@ gPokedexEntries:: @ 856B5B0
.string "DELIVERY$", 12
pokedex_entry 9, 160, gDelibirdPokedexText, 293, 11, 256, 0
.string "KITE$", 12
pokedex_entry 21, 2200, gMantinePokedexText, 256, 0, 342, 7
pokedex_entry 21, 2200, gMantinePokedexText, 256, 0, 342, 7
.string "ARMOR BIRD$", 12
pokedex_entry 17, 505, gSkarmoryPokedexText, 256, 0, 271, 1
.string "DARK$", 12
@@ -461,11 +461,11 @@ gPokedexEntries:: @ 856B5B0
.string "DARK$", 12
pokedex_entry 14, 350, gHoundoomPokedexText, 256, 4, 256, 0
.string "DRAGON$", 12
pokedex_entry 18, 1520, gKingdraPokedexText, 256, 0, 287, 0
pokedex_entry 18, 1520, gKingdraPokedexText, 256, 0, 287, 0
.string "LONG NOSE$", 12
pokedex_entry 5, 335, gPhanpyPokedexText, 465, 21, 256, 0
pokedex_entry 5, 335, gPhanpyPokedexText, 465, 21, 256, 0
.string "ARMOR$", 12
pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0
pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0
.string "VIRTUAL$", 12
pokedex_entry 6, 325, gPorygon2PokedexText, 320, 17, 256, 0
.string "BIG HORN$", 12
@@ -473,51 +473,51 @@ gPokedexEntries:: @ 856B5B0
.string "PAINTER$", 12
pokedex_entry 12, 580, gSmearglePokedexText, 287, 5, 256, 0
.string "SCUFFLE$", 12
pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0
pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0
.string "HANDSTAND$", 12
pokedex_entry 14, 480, gHitmontopPokedexText, 256, 2, 257, 0
.string "KISS$", 12
pokedex_entry 4, 60, gSmoochumPokedexText, 440, 20, 256, 0
.string "ELECTRIC$", 12
pokedex_entry 6, 235, gElekidPokedexText, 363, 14, 256, 0
pokedex_entry 6, 235, gElekidPokedexText, 363, 14, 256, 0
.string "LIVE COAL$", 12
pokedex_entry 7, 214, gMagbyPokedexText, 284, 13, 256, 0
pokedex_entry 7, 214, gMagbyPokedexText, 284, 13, 256, 0
.string "MILK COW$", 12
pokedex_entry 12, 755, gMiltankPokedexText, 280, 5, 256, 0
pokedex_entry 12, 755, gMiltankPokedexText, 280, 5, 256, 0
.string "HAPPINESS$", 12
pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3
pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3
.string "THUNDER$", 12
pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7
pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7
.string "VOLCANO$", 12
pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7
pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7
.string "AURORA$", 12
pokedex_entry 20, 1870, gSuicunePokedexText, 269, 0, 345, 7
pokedex_entry 20, 1870, gSuicunePokedexText, 269, 0, 345, 7
.string "ROCK SKIN$", 12
pokedex_entry 6, 720, gLarvitarPokedexText, 472, 18, 256, 0
.string "HARD SHELL$", 12
pokedex_entry 12, 1520, gPupitarPokedexText, 292, 8, 256, 0
pokedex_entry 12, 1520, gPupitarPokedexText, 292, 8, 256, 0
.string "ARMOR$", 12
pokedex_entry 20, 2020, gTyranitarPokedexText, 256, 0, 345, 7
.string "DIVING$", 12
pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19
pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19
.string "RAINBOW$", 12
pokedex_entry 38, 1990, gHoOhPokedexText, 256, 0, 610, 17
pokedex_entry 38, 1990, gHoOhPokedexText, 256, 0, 610, 17
.string "TIME TRAVEL$", 12
pokedex_entry 6, 50, gCelebiPokedexText, 393, -10, 256, 0
pokedex_entry 6, 50, gCelebiPokedexText, 393, -10, 256, 0
.string "WOOD GECKO$", 12
pokedex_entry 5, 50, gTreeckoPokedexText, 541, 19, 256, 0
pokedex_entry 5, 50, gTreeckoPokedexText, 541, 19, 256, 0
.string "WOOD GECKO$", 12
pokedex_entry 9, 216, gGrovylePokedexText, 360, 5, 256, 0
pokedex_entry 9, 216, gGrovylePokedexText, 360, 5, 256, 0
.string "FOREST$", 12
pokedex_entry 17, 522, gSceptilePokedexText, 256, -1, 275, 2
.string "CHICK$", 12
pokedex_entry 4, 25, gTorchicPokedexText, 566, 19, 256, 0
pokedex_entry 4, 25, gTorchicPokedexText, 566, 19, 256, 0
.string "YOUNG FOWL$", 12
pokedex_entry 9, 195, gCombuskenPokedexText, 343, 5, 256, 0
.string "BLAZE$", 12
pokedex_entry 19, 520, gBlazikenPokedexText, 256, 0, 301, 4
.string "MUD FISH$", 12
pokedex_entry 4, 76, gMudkipPokedexText, 535, 20, 256, 0
pokedex_entry 4, 76, gMudkipPokedexText, 535, 20, 256, 0
.string "MUD FISH$", 12
pokedex_entry 7, 280, gMarshtompPokedexText, 340, 7, 256, 0
.string "MUD FISH$", 12
@@ -529,91 +529,91 @@ gPokedexEntries:: @ 856B5B0
.string "TINYRACCOON$", 12
pokedex_entry 4, 175, gZigzagoonPokedexText, 560, 22, 256, 0
.string "RUSHING$", 12
pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0
pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0
.string "WORM$", 12
pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0
pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0
.string "COCOON$", 12
pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0
pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0
.string "BUTTERFLY$", 12
pokedex_entry 10, 284, gBeautiflyPokedexText, 298, -1, 256, 0
.string "COCOON$", 12
pokedex_entry 7, 115, gCascoonPokedexText, 391, 20, 256, 0
pokedex_entry 7, 115, gCascoonPokedexText, 391, 20, 256, 0
.string "POISON MOTH$", 12
pokedex_entry 12, 316, gDustoxPokedexText, 269, 1, 256, 0
pokedex_entry 12, 316, gDustoxPokedexText, 269, 1, 256, 0
.string "WATER WEED$", 12
pokedex_entry 5, 26, gLotadPokedexText, 406, 19, 256, 0
pokedex_entry 5, 26, gLotadPokedexText, 406, 19, 256, 0
.string "JOLLY$", 12
pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0
pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0
.string "CAREFREE$", 12
pokedex_entry 15, 550, gLudicoloPokedexText, 256, 0, 268, -1
.string "ACORN$", 12
pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0
pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0
.string "WILY$", 12
pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0
pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0
.string "WICKED$", 12
pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0
pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0
.string "TINYSWALLOW$", 12
pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0
pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0
.string "SWALLOW$", 12
pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0
pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0
.string "SEAGULL$", 12
pokedex_entry 6, 95, gWingullPokedexText, 295, -2, 256, 0
pokedex_entry 6, 95, gWingullPokedexText, 295, -2, 256, 0
.string "WATER BIRD$", 12
pokedex_entry 12, 280, gPelipperPokedexText, 288, 1, 256, 0
.string "FEELING$", 12
pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0
pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0
.string "EMOTION$", 12
pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0
pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0
.string "EMBRACE$", 12
pokedex_entry 16, 484, gGardevoirPokedexText, 256, 0, 256, 0
.string "POND SKATER$", 12
pokedex_entry 5, 17, gSurskitPokedexText, 375, 17, 256, 0
pokedex_entry 5, 17, gSurskitPokedexText, 375, 17, 256, 0
.string "EYEBALL$", 12
pokedex_entry 8, 36, gMasquerainPokedexText, 378, 8, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 4, 45, gShroomishPokedexText, 513, 22, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0
pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0
.string "SLACKER$", 12
pokedex_entry 8, 240, gSlakothPokedexText, 291, 16, 256, 0
pokedex_entry 8, 240, gSlakothPokedexText, 291, 16, 256, 0
.string "WILD MONKEY$", 12
pokedex_entry 14, 465, gVigorothPokedexText, 301, 2, 256, 0
.string "LAZY$", 12
pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1
pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1
.string "TRAINEE$", 12
pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0
pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0
.string "NINJA$", 12
pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0
pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0
.string "SHED$", 12
pokedex_entry 8, 12, gShedinjaPokedexText, 372, -8, 256, 0
.string "WHISPER$", 12
pokedex_entry 6, 163, gWhismurPokedexText, 373, 17, 256, 0
pokedex_entry 6, 163, gWhismurPokedexText, 373, 17, 256, 0
.string "BIG VOICE$", 12
pokedex_entry 10, 405, gLoudredPokedexText, 356, 10, 256, 0
pokedex_entry 10, 405, gLoudredPokedexText, 356, 10, 256, 0
.string "LOUD NOISE$", 12
pokedex_entry 15, 840, gExploudPokedexText, 284, 1, 256, 0
pokedex_entry 15, 840, gExploudPokedexText, 284, 1, 256, 0
.string "GUTS$", 12
pokedex_entry 10, 864, gMakuhitaPokedexText, 256, 10, 256, 0
.string "ARM THRUST$", 12
pokedex_entry 23, 2538, gHariyamaPokedexText, 256, 0, 343, 7
.string "POLKA DOT$", 12
pokedex_entry 2, 20, gAzurillPokedexText, 603, 23, 256, 0
pokedex_entry 2, 20, gAzurillPokedexText, 603, 23, 256, 0
.string "COMPASS$", 12
pokedex_entry 10, 970, gNosepassPokedexText, 256, 9, 289, 3
.string "KITTEN$", 12
pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0
pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0
.string "PRIM$", 12
pokedex_entry 11, 326, gDelcattyPokedexText, 322, 10, 256, 0
.string "DARKNESS$", 12
pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0
pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0
.string "DECEIVER$", 12
pokedex_entry 6, 115, gMawilePokedexText, 466, 17, 256, 0
pokedex_entry 6, 115, gMawilePokedexText, 466, 17, 256, 0
.string "IRON ARMOR$", 12
pokedex_entry 4, 600, gAronPokedexText, 419, 23, 256, 0
pokedex_entry 4, 600, gAronPokedexText, 419, 23, 256, 0
.string "IRON ARMOR$", 12
pokedex_entry 9, 1200, gLaironPokedexText, 275, 12, 256, 0
pokedex_entry 9, 1200, gLaironPokedexText, 275, 12, 256, 0
.string "IRON ARMOR$", 12
pokedex_entry 21, 3600, gAggronPokedexText, 256, -1, 350, 6
pokedex_entry 21, 3600, gAggronPokedexText, 256, -1, 350, 6
.string "MEDITATE$", 12
pokedex_entry 6, 112, gMedititePokedexText, 465, 17, 256, 0
.string "MEDITATE$", 12
@@ -623,61 +623,61 @@ gPokedexEntries:: @ 856B5B0
.string "DISCHARGE$", 12
pokedex_entry 15, 402, gManectricPokedexText, 256, 3, 257, 0
.string "CHEERING$", 12
pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0
pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0
.string "CHEERING$", 12
pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0
pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0
.string "FIREFLY$", 12
pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0
pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0
.string "FIREFLY$", 12
pokedex_entry 6, 177, gIllumisePokedexText, 572, 19, 256, 0
.string "THORN$", 12
pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0
pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0
.string "STOMACH$", 12
pokedex_entry 4, 103, gGulpinPokedexText, 593, 23, 256, 0
pokedex_entry 4, 103, gGulpinPokedexText, 593, 23, 256, 0
.string "POISON BAG$", 12
pokedex_entry 17, 800, gSwalotPokedexText, 256, 6, 345, 3
pokedex_entry 17, 800, gSwalotPokedexText, 256, 6, 345, 3
.string "SAVAGE$", 12
pokedex_entry 8, 208, gCarvanhaPokedexText, 362, 0, 256, 0
.string "BRUTAL$", 12
pokedex_entry 18, 888, gSharpedoPokedexText, 256, 0, 317, 3
.string "BALL WHALE$", 12
pokedex_entry 20, 1300, gWailmerPokedexText, 256, 2, 493, 0
pokedex_entry 20, 1300, gWailmerPokedexText, 256, 2, 493, 0
.string "FLOAT WHALE$", 12
pokedex_entry 145, 3980, gWailordPokedexText, 256, 0, 1352, 18
pokedex_entry 145, 3980, gWailordPokedexText, 256, 0, 1352, 18
.string "NUMB$", 12
pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0
pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0
.string "ERUPTION$", 12
pokedex_entry 19, 2200, gCameruptPokedexText, 256, 7, 345, 6
.string "COAL$", 12
pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0
pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0
.string "BOUNCE$", 12
pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0
pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0
.string "MANIPULATE$", 12
pokedex_entry 9, 715, gGrumpigPokedexText, 358, 10, 256, 0
pokedex_entry 9, 715, gGrumpigPokedexText, 358, 10, 256, 0
.string "SPOT PANDA$", 12
pokedex_entry 11, 50, gSpindaPokedexText, 321, 4, 256, 0
pokedex_entry 11, 50, gSpindaPokedexText, 321, 4, 256, 0
.string "ANT PIT$", 12
pokedex_entry 7, 150, gTrapinchPokedexText, 298, 17, 256, 0
.string "VIBRATION$", 12
pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0
pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0
.string "MYSTIC$", 12
pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1
pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1
.string "CACTUS$", 12
pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0
pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0
.string "SCARECROW$", 12
pokedex_entry 13, 774, gCacturnePokedexText, 327, 5, 256, 0
.string "COTTON BIRD$", 12
pokedex_entry 4, 12, gSwabluPokedexText, 422, -8, 256, 0
pokedex_entry 4, 12, gSwabluPokedexText, 422, -8, 256, 0
.string "HUMMING$", 12
pokedex_entry 11, 206, gAltariaPokedexText, 327, 0, 256, 0
pokedex_entry 11, 206, gAltariaPokedexText, 327, 0, 256, 0
.string "CAT FERRET$", 12
pokedex_entry 13, 403, gZangoosePokedexText, 256, 3, 256, 0
.string "FANG SNAKE$", 12
pokedex_entry 27, 525, gSeviperPokedexText, 275, 7, 256, 0
pokedex_entry 27, 525, gSeviperPokedexText, 275, 7, 256, 0
.string "METEORITE$", 12
pokedex_entry 10, 1680, gLunatonePokedexText, 300, 3, 256, 0
.string "METEORITE$", 12
pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0
pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0
.string "WHISKERS$", 12
pokedex_entry 4, 19, gBarboachPokedexText, 581, -3, 256, 0
.string "WHISKERS$", 12
@@ -687,90 +687,90 @@ gPokedexEntries:: @ 856B5B0
.string "ROGUE$", 12
pokedex_entry 11, 328, gCrawdauntPokedexText, 365, 9, 256, 0
.string "CLAY DOLL$", 12
pokedex_entry 5, 215, gBaltoyPokedexText, 457, 21, 256, 0
pokedex_entry 5, 215, gBaltoyPokedexText, 457, 21, 256, 0
.string "CLAY DOLL$", 12
pokedex_entry 15, 1080, gClaydolPokedexText, 256, 3, 280, 1
pokedex_entry 15, 1080, gClaydolPokedexText, 256, 3, 280, 1
.string "SEA LILY$", 12
pokedex_entry 10, 238, gLileepPokedexText, 305, 8, 256, 0
pokedex_entry 10, 238, gLileepPokedexText, 305, 8, 256, 0
.string "BARNACLE$", 12
pokedex_entry 15, 604, gCradilyPokedexText, 267, 0, 256, 0
pokedex_entry 15, 604, gCradilyPokedexText, 267, 0, 256, 0
.string "OLD SHRIMP$", 12
pokedex_entry 7, 125, gAnorithPokedexText, 296, 4, 256, 0
pokedex_entry 7, 125, gAnorithPokedexText, 296, 4, 256, 0
.string "PLATE$", 12
pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0
pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0
.string "FISH$", 12
pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0
pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0
.string "TENDER$", 12
pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7
pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7
.string "WEATHER$", 12
pokedex_entry 3, 8, gCastformPokedexText, 435, -5, 256, 0
pokedex_entry 3, 8, gCastformPokedexText, 435, -5, 256, 0
.string "COLOR SWAP$", 12
pokedex_entry 10, 220, gKecleonPokedexText, 316, 10, 256, 0
pokedex_entry 10, 220, gKecleonPokedexText, 316, 10, 256, 0
.string "PUPPET$", 12
pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0
pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0
.string "MARIONETTE$", 12
pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0
pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0
.string "REQUIEM$", 12
pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0
pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0
.string "BECKON$", 12
pokedex_entry 16, 306, gDusclopsPokedexText, 256, 3, 299, 1
.string "FRUIT$", 12
pokedex_entry 20, 1000, gTropiusPokedexText, 256, 0, 344, 7
pokedex_entry 20, 1000, gTropiusPokedexText, 256, 0, 344, 7
.string "WIND CHIME$", 12
pokedex_entry 6, 10, gChimechoPokedexText, 505, 0, 256, 0
.string "DISASTER$", 12
pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0
pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0
.string "BRIGHT$", 12
pokedex_entry 6, 140, gWynautPokedexText, 484, 19, 256, 0
pokedex_entry 6, 140, gWynautPokedexText, 484, 19, 256, 0
.string "SNOW HAT$", 12
pokedex_entry 7, 168, gSnoruntPokedexText, 380, 15, 256, 0
pokedex_entry 7, 168, gSnoruntPokedexText, 380, 15, 256, 0
.string "FACE$", 12
pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0
pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0
.string "CLAP$", 12
pokedex_entry 8, 395, gSphealPokedexText, 315, 16, 256, 0
pokedex_entry 8, 395, gSphealPokedexText, 315, 16, 256, 0
.string "BALL ROLL$", 12
pokedex_entry 11, 876, gSealeoPokedexText, 338, 13, 256, 0
pokedex_entry 11, 876, gSealeoPokedexText, 338, 13, 256, 0
.string "ICE BREAK$", 12
pokedex_entry 14, 1506, gWalreinPokedexText, 316, 4, 256, 0
pokedex_entry 14, 1506, gWalreinPokedexText, 316, 4, 256, 0
.string "BIVALVE$", 12
pokedex_entry 4, 525, gClamperlPokedexText, 691, 22, 256, 0
.string "DEEP SEA$", 12
pokedex_entry 17, 270, gHuntailPokedexText, 307, 1, 256, 0
pokedex_entry 17, 270, gHuntailPokedexText, 307, 1, 256, 0
.string "SOUTH SEA$", 12
pokedex_entry 18, 226, gGorebyssPokedexText, 278, 5, 256, 0
.string "LONGEVITY$", 12
pokedex_entry 10, 234, gRelicanthPokedexText, 316, 7, 256, 0
.string "RENDEZVOUS$", 12
pokedex_entry 6, 87, gLuvdiscPokedexText, 371, 2, 256, 0
pokedex_entry 6, 87, gLuvdiscPokedexText, 371, 2, 256, 0
.string "ROCK HEAD$", 12
pokedex_entry 6, 421, gBagonPokedexText, 448, 18, 256, 0
pokedex_entry 6, 421, gBagonPokedexText, 448, 18, 256, 0
.string "ENDURANCE$", 12
pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0
pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0
.string "DRAGON$", 12
pokedex_entry 15, 1026, gSalamencePokedexText, 256, 0, 256, 0
.string "IRON BALL$", 12
pokedex_entry 6, 952, gBeldumPokedexText, 414, -1, 256, 0
pokedex_entry 6, 952, gBeldumPokedexText, 414, -1, 256, 0
.string "IRON CLAW$", 12
pokedex_entry 12, 2025, gMetangPokedexText, 256, 6, 256, 0
pokedex_entry 12, 2025, gMetangPokedexText, 256, 6, 256, 0
.string "IRON LEG$", 12
pokedex_entry 16, 5500, gMetagrossPokedexText, 256, 4, 447, 9
.string "ROCK PEAK$", 12
pokedex_entry 17, 2300, gRegirockPokedexText, 256, 2, 309, 1
.string "ICEBERG$", 12
pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2
pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2
.string "IRON$", 12
pokedex_entry 19, 2050, gRegisteelPokedexText, 256, 0, 359, 6
.string "EON$", 12
pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0
pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0
.string "EON$", 12
pokedex_entry 20, 600, gLatiosPokedexText, 256, 0, 294, 3
pokedex_entry 20, 600, gLatiosPokedexText, 256, 0, 294, 3
.string "SEA BASIN$", 12
pokedex_entry 45, 3520, gKyogrePokedexText, 256, 0, 614, 13
pokedex_entry 45, 3520, gKyogrePokedexText, 256, 0, 614, 13
.string "CONTINENT$", 12
pokedex_entry 35, 9500, gGroudonPokedexText, 256, 0, 515, 14
pokedex_entry 35, 9500, gGroudonPokedexText, 256, 0, 515, 14
.string "SKY HIGH$", 12
pokedex_entry 70, 2065, gRayquazaPokedexText, 256, 0, 448, 12
.string "WISH$", 12
pokedex_entry 3, 11, gJirachiPokedexText, 608, -8, 256, 0
pokedex_entry 3, 11, gJirachiPokedexText, 608, -8, 256, 0
.string "DNA$", 12
pokedex_entry 17, 608, gDeoxysPokedexText, 256, 0, 290, 2
pokedex_entry 17, 608, gDeoxysPokedexText, 256, 0, 290, 2
data/pokemon_icon.s
-27
View File
@@ -1,27 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
@ 857BCA8
.include "data/graphics/pokemon/icon_table.inc"
@ 857C388
.include "data/graphics/pokemon/icon_palette_indices.inc"
@ 857C540
.include "data/graphics/pokemon/icon_palette_table.inc"
gUnknown_0857C570:: @ 857C570
.incbin "baserom.gba", 0x57c570, 0x44
gUnknown_0857C5B4:: @ 857C5B4
.incbin "baserom.gba", 0x57c5b4, 0x14
.incbin "baserom.gba", 0x57c5c8, 0x20
gUnknown_0857C5E8:: @ 857C5E8
.incbin "baserom.gba", 0x57c5e8, 0x8
gUnknown_0857C5F0:: @ 857C5F0
.incbin "baserom.gba", 0x57c5f0, 0x18
data/pokemon_storage_system.s
+118 -29
View File
@@ -1,23 +1,8 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_085716C0:: @ 85716C0
.incbin "baserom.gba", 0x5716c0, 0x28
gUnknown_085716E8:: @ 85716E8
.incbin "baserom.gba", 0x5716e8, 0x28
gUnknown_08571710:: @ 8571710
.incbin "baserom.gba", 0x571710, 0x24
gUnknown_08571734:: @ 8571734
.incbin "baserom.gba", 0x571734, 0x3
gUnknown_08571737:: @ 8571737
.incbin "baserom.gba", 0x571737, 0x5
.section .rodata
.align 2, 0
gUnknown_0857173C:: @ 857173C
.incbin "baserom.gba", 0x57173c, 0x20
@@ -59,7 +44,13 @@ gUnknown_085724A4:: @ 85724A4
.incbin "baserom.gba", 0x5724a4, 0x18
gUnknown_085724BC:: @ 85724BC
.incbin "baserom.gba", 0x5724bc, 0x238
.incbin "baserom.gba", 0x5724bc, 0x18
gUnknown_085724D4:: @ 85724D4
.incbin "baserom.gba", 0x5724d4, 0x20
gUnknown_085724F4:: @ 85724F4
.incbin "baserom.gba", 0x5724f4, 0x200
gUnknown_085726F4:: @ 85726F4
.incbin "baserom.gba", 0x5726f4, 0x20
@@ -71,28 +62,126 @@ gUnknown_08572734:: @ 8572734
.incbin "baserom.gba", 0x572734, 0x10
gUnknown_08572744:: @ 8572744
.incbin "baserom.gba", 0x572744, 0x8
obj_pal gUnknown_085724D4, 0xDACA
gUnknown_0857274C:: @ 857274C
.incbin "baserom.gba", 0x57274c, 0x8
obj_tiles gUnknown_085724F4, 0x1C0, 5
gUnknown_08572754:: @ 8572754
.incbin "baserom.gba", 0x572754, 0x18
spr_template 2, 0xDAC6, gOamData_857286C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0857276C:: @ 857276C
.incbin "baserom.gba", 0x57276c, 0xf8
.4byte gUnknown_085EB7EF, 0
.4byte gUnknown_085EB802, 0
.4byte gUnknown_085EB81A, 0
.4byte gUnknown_085EB82F, 0
.4byte gUnknown_085EB843, 1
.4byte gUnknown_085EB853, 0
.4byte gUnknown_085EB866, 0
.4byte gUnknown_085EB87C, 1
.4byte gUnknown_085EB88E, 0
.4byte gUnknown_085EB89F, 0
.4byte gUnknown_085EB8B5, 4
.4byte gUnknown_085EB8C6, 6
.4byte gUnknown_085EB8D3, 0
.4byte gUnknown_085EB8E6, 0
.4byte gUnknown_085EB900, 0
.4byte gUnknown_085EB913, 0
.4byte gUnknown_085EB92D, 0
.4byte gUnknown_085EB946, 0
.4byte gUnknown_085EB960, 0
.4byte gUnknown_085EB979, 1
.4byte gUnknown_085EB987, 0
.4byte gUnknown_085EB9A1, 0
.4byte gUnknown_085EB9AB, 0
.4byte gUnknown_085EB843, 7
.4byte gUnknown_085EB9C3, 0
.4byte gUnknown_085EB9D6, 7
.4byte gUnknown_085EB9EE, 0
.4byte gUnknown_085EB9FF, 0
.4byte gUnknown_085EBA19, 7
.4byte gUnknown_085EBA29, 7
.4byte gUnknown_085EBA38, 0
.align 2
gUnknown_08572864:: @ 8572864
.incbin "baserom.gba", 0x572864, 0x58
window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x5C
.align 2
gOamData_857286C:: @ 857286C
.2byte 0x0000
.2byte 0xC000
.2byte 0x0000
.align 2
gOamData_8572874:: @ 8572874
.2byte 0x4000
.2byte 0x0000
.2byte 0x0000
.align 2
gSpriteAnim_857287C:: @ 857287C
obj_image_anim_frame 0, 5
obj_image_anim_end
.align 2
gSpriteAnim_8572884:: @ 8572884
obj_image_anim_frame 2, 8
obj_image_anim_frame 4, 8
obj_image_anim_frame 6, 8
obj_image_anim_jump 0
.align 2
gSpriteAnim_8572894:: @ 8572894
obj_image_anim_frame 8, 5
obj_image_anim_end
.align 2
gSpriteAnim_857289C:: @ 857289C
obj_image_anim_frame 10, 8
obj_image_anim_frame 4, 8
obj_image_anim_frame 12, 8
obj_image_anim_jump 0
.align 2
gSpriteAnimTable_85728AC:: @ 85728AC
.4byte gSpriteAnim_857287C
.4byte gSpriteAnim_8572884
.4byte gSpriteAnim_8572894
.4byte gSpriteAnim_857289C
gUnknown_085728BC:: @ 85728BC
.incbin "baserom.gba", 0x5728bc, 0x18
spr_template 5, 0xDACA, gOamData_8572874, gSpriteAnimTable_85728AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085728D4:: @ 85728D4
.incbin "baserom.gba", 0x5728d4, 0x48
spr_template 0x12, 0xDAC0, gOamData_85728EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0857291C:: @ 857291C
.incbin "baserom.gba", 0x57291c, 0x4c58
.align 2
gOamData_85728EC:: @ 85728EC
.2byte 0x0000
.2byte 0x8000
.2byte 0x0000
.align 2
gSpriteAffineAnim_85728F4:: @ 85728F4
obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 120
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_8572904:: @ 8572904
obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
obj_rot_scal_anim_frame 0x10, 0x10, 0, 15
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_857291C:: @ 857291C
.4byte gSpriteAffineAnim_85728F4
.4byte gSpriteAffineAnim_8572904
gUnknown_08572924:: @ 8572924
.incbin "baserom.gba", 0x572924, 0x4c50
gUnknown_08577574:: @ 8577574
.incbin "baserom.gba", 0x577574, 0x44
data/pokemon_summary_screen.s
+25 -4
View File
@@ -18,12 +18,27 @@ gUnknown_0861CBEC:: @ 861CBEC
gUnknown_0861CBF8:: @ 861CBF8
.incbin "baserom.gba", 0x61cbf8, 0xc
.align 2
gUnknown_0861CC04:: @ 861CC04
.incbin "baserom.gba", 0x61cc04, 0xc
.4byte gSummaryScreenPowAcc_Tilemap
.byte 0x00
.byte 0x00
.byte 0x0A
.byte 0x07
.byte 0x00
.byte 0x2D
.align 2
gUnknown_0861CC10:: @ 861CC10
.incbin "baserom.gba", 0x61cc10, 0xc
.4byte gUnknown_08DC3C34
.byte 0x00
.byte 0x00
.byte 0x0A
.byte 0x07
.byte 0x00
.byte 0x2D
.align 2
gUnknown_0861CC1C:: @ 861CC1C
.incbin "baserom.gba", 0x61cc1c, 0x8
@@ -121,7 +136,12 @@ gUnknown_0861F2C0:: @ 861F2C0
.incbin "baserom.gba", 0x61f2c0, 0x18
gUnknown_0861F2D8:: @ 861F2D8
.incbin "baserom.gba", 0x61f2d8, 0x30
.4byte gMenuText_Use, sub_81C61E0
.4byte gMenuText_Toss, sub_81C62C4
.4byte gMenuText_Give, sub_81C6648
.4byte gText_Cancel2, sub_81C6258
.4byte gMenuText_Use, sub_81C679C
.4byte gText_EmptyString2, NULL
gUnknown_0861F308:: @ 861F308
.incbin "baserom.gba", 0x61f308, 0x4
@@ -136,7 +156,8 @@ gUnknown_0861F310:: @ 861F310
.incbin "baserom.gba", 0x61f310, 0x4
gUnknown_0861F314:: @ 861F314
.incbin "baserom.gba", 0x61f314, 0x8
.4byte sub_81C654C
.4byte sub_81C63D0
gUnknown_0861F31C:: @ 861F31C
.incbin "baserom.gba", 0x61f31c, 0xc
data/pokenav.s
+1559 -47
View File
File diff suppressed because it is too large. Load diff
data/rayquaza_scene.s
-160
View File
@@ -1,160 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0862A6A0:: @ 862A6A0
.incbin "baserom.gba", 0x62a6a0, 0x8c
gUnknown_0862A72C:: @ 862A72C
.incbin "baserom.gba", 0x62a72c, 0x24
gUnknown_0862A750:: @ 862A750
.incbin "baserom.gba", 0x62a750, 0x24
gUnknown_0862A774:: @ 862A774
.incbin "baserom.gba", 0x62a774, 0xa8
gUnknown_0862A81C:: @ 862A81C
.incbin "baserom.gba", 0x62a81c, 0x30
gUnknown_0862A84C:: @ 862A84C
.incbin "baserom.gba", 0x62a84c, 0x18
gUnknown_0862A864:: @ 862A864
.incbin "baserom.gba", 0x62a864, 0x18
gUnknown_0862A87C:: @ 862A87C
.incbin "baserom.gba", 0x62a87c, 0xc
gUnknown_0862A888:: @ 862A888
.incbin "baserom.gba", 0x62a888, 0x3c
gUnknown_0862A8C4:: @ 862A8C4
.incbin "baserom.gba", 0x62a8c4, 0x8
gUnknown_0862A8CC:: @ 862A8CC
.incbin "baserom.gba", 0x62a8cc, 0x8
gUnknown_0862A8D4:: @ 862A8D4
.incbin "baserom.gba", 0x62a8d4, 0x24
gUnknown_0862A8F8:: @ 862A8F8
.incbin "baserom.gba", 0x62a8f8, 0x8
gUnknown_0862A900:: @ 862A900
.incbin "baserom.gba", 0x62a900, 0x24
gUnknown_0862A924:: @ 862A924
.incbin "baserom.gba", 0x62a924, 0x8
gUnknown_0862A92C:: @ 862A92C
.incbin "baserom.gba", 0x62a92c, 0xa8
gUnknown_0862A9D4:: @ 862A9D4
.incbin "baserom.gba", 0x62a9d4, 0x8
gUnknown_0862A9DC:: @ 862A9DC
.incbin "baserom.gba", 0x62a9dc, 0x8
gUnknown_0862A9E4:: @ 862A9E4
.incbin "baserom.gba", 0x62a9e4, 0x30
gUnknown_0862AA14:: @ 862AA14
.incbin "baserom.gba", 0x62aa14, 0x8
gUnknown_0862AA1C:: @ 862AA1C
.incbin "baserom.gba", 0x62aa1c, 0x18
gUnknown_0862AA34:: @ 862AA34
.incbin "baserom.gba", 0x62aa34, 0x8
gUnknown_0862AA3C:: @ 862AA3C
.incbin "baserom.gba", 0x62aa3c, 0x18
gUnknown_0862AA54:: @ 862AA54
.incbin "baserom.gba", 0x62aa54, 0x3c
gUnknown_0862AA90:: @ 862AA90
.incbin "baserom.gba", 0x62aa90, 0x8
gUnknown_0862AA98:: @ 862AA98
.incbin "baserom.gba", 0x62aa98, 0x8
gUnknown_0862AAA0:: @ 862AAA0
.incbin "baserom.gba", 0x62aaa0, 0x18
gUnknown_0862AAB8:: @ 862AAB8
.incbin "baserom.gba", 0x62aab8, 0x14
gUnknown_0862AACC:: @ 862AACC
.incbin "baserom.gba", 0x62aacc, 0x30
gUnknown_0862AAFC:: @ 862AAFC
.incbin "baserom.gba", 0x62aafc, 0x8
gUnknown_0862AB04:: @ 862AB04
.incbin "baserom.gba", 0x62ab04, 0x8
gUnknown_0862AB0C:: @ 862AB0C
.incbin "baserom.gba", 0x62ab0c, 0x8
gUnknown_0862AB14:: @ 862AB14
.incbin "baserom.gba", 0x62ab14, 0x18
gUnknown_0862AB2C:: @ 862AB2C
.incbin "baserom.gba", 0x62ab2c, 0x18
gUnknown_0862AB44:: @ 862AB44
.incbin "baserom.gba", 0x62ab44, 0xe4
gUnknown_0862AC28:: @ 862AC28
.incbin "baserom.gba", 0x62ac28, 0x8
gUnknown_0862AC30:: @ 862AC30
.incbin "baserom.gba", 0x62ac30, 0x8
gUnknown_0862AC38:: @ 862AC38
.incbin "baserom.gba", 0x62ac38, 0x8
gUnknown_0862AC40:: @ 862AC40
.incbin "baserom.gba", 0x62ac40, 0x8
gUnknown_0862AC48:: @ 862AC48
.incbin "baserom.gba", 0x62ac48, 0x8
gUnknown_0862AC50:: @ 862AC50
.incbin "baserom.gba", 0x62ac50, 0x8
gUnknown_0862AC58:: @ 862AC58
.incbin "baserom.gba", 0x62ac58, 0x8
gUnknown_0862AC60:: @ 862AC60
.incbin "baserom.gba", 0x62ac60, 0x8
gUnknown_0862AC68:: @ 862AC68
.incbin "baserom.gba", 0x62ac68, 0x8
gUnknown_0862AC70:: @ 862AC70
.incbin "baserom.gba", 0x62ac70, 0x8
gUnknown_0862AC78:: @ 862AC78
.incbin "baserom.gba", 0x62ac78, 0x18
gUnknown_0862AC90:: @ 862AC90
.incbin "baserom.gba", 0x62ac90, 0x18
gUnknown_0862ACA8:: @ 862ACA8
.incbin "baserom.gba", 0x62aca8, 0x18
gUnknown_0862ACC0:: @ 862ACC0
.incbin "baserom.gba", 0x62acc0, 0x18
gUnknown_0862ACD8:: @ 862ACD8
.incbin "baserom.gba", 0x62acd8, 0x18
gUnknown_0862ACF0:: @ 862ACF0
.incbin "baserom.gba", 0x62acf0, 0x18
gUnknown_0862AD08:: @ 862AD08
.incbin "baserom.gba", 0x62ad08, 0xc
data/record_mixing.s
+1 -1
View File
@@ -2,7 +2,7 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2, 0
gUnknown_0858CF8C:: @ 858CF8C
.incbin "baserom.gba", 0x58cf8c, 0x2
data/reset_rtc_screen.s
+4 -4
View File
@@ -1,8 +1,8 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
gUnknown_08510404:: @ 8510404 struct BgTemplate
.4byte 0x000001f0
data/rom_8525F58.s
+9 -9
View File
@@ -1,34 +1,34 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.section .rodata
.align 2
.align 2
gUnknown_08525F58:: @ 8525F58
.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
.align 2
.align 2
gCastformFrontSpriteCoords:: @ 8525F78
.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
.align 2
.align 2
gUnknown_08525F88:: @ 8525F88
.byte 0x0d, 0x0e, 0x0d, 0x0d
.align 2
.align 2
gUnknown_08525F8C:: @ 8525F8C
.byte 0x00, 0x00, 0x00, 0x00
.align 2
.align 2
gUnknown_08525F90:: @ 8525F90
spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.align 2
gUnknown_08525FC0:: @ 8525FC0
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
data/save.s
+14 -14
View File
@@ -4,17 +4,17 @@
.section .rodata
gSaveSectionOffsets:: @ 85CDC00
.2byte 0, 0xF2C
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF08
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF80
.2byte 0x3E00, 0xF80
.2byte 0x4D80, 0xF80
.2byte 0x5D00, 0xF80
.2byte 0x6C80, 0xF80
.2byte 0x7C00, 0x7D0
.2byte 0, 0xF2C
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF08
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF80
.2byte 0x3E00, 0xF80
.2byte 0x4D80, 0xF80
.2byte 0x5D00, 0xF80
.2byte 0x6C80, 0xF80
.2byte 0x7C00, 0x7D0
data/script_menu.s
+1 -1
View File
@@ -728,7 +728,7 @@ gUnknown_0858BAF0:: @ 858BAF0
gUnknown_0858BB68:: @ 858BB68
.byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F
.align 2
.align 2
gUnknown_0858BB70:: @ 858BB70
.4byte gText_SomeonesPC
.4byte gText_LanettesPC
data/script_pokemon_util_80F87D8.s
+2 -2
View File
@@ -2,6 +2,6 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2, 0
gUnknown_0858D8EC:: @ 858D8EC
.incbin "baserom.gba", 0x58d8ec, 0x4
.byte 3, 4, 5, 14
data/slot_machine.s
+31 -2
View File
@@ -241,8 +241,28 @@ gUnknown_085A8264:: @ 85A8264
gUnknown_085A82CC:: @ 85A82CC
.incbin "baserom.gba", 0x5a82cc, 0x68
.align 2
gUnknown_085A8334:: @ 85A8334
.incbin "baserom.gba", 0x5a8334, 0xb0
obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000
obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001
obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002
obj_tiles gSlotMachineReelSymbol4Tiles, 0x0200, 0x0003
obj_tiles gSlotMachineReelSymbol5Tiles, 0x0200, 0x0004
obj_tiles gSlotMachineReelSymbol6Tiles, 0x0200, 0x0005
obj_tiles gSlotMachineReelSymbol7Tiles, 0x0200, 0x0006
obj_tiles gSlotMachineNumber0Tiles, 0x0040, 0x0007
obj_tiles gSlotMachineNumber1Tiles, 0x0040, 0x0008
obj_tiles gSlotMachineNumber2Tiles, 0x0040, 0x0009
obj_tiles gSlotMachineNumber3Tiles, 0x0040, 0x000A
obj_tiles gSlotMachineNumber4Tiles, 0x0040, 0x000B
obj_tiles gSlotMachineNumber5Tiles, 0x0040, 0x000C
obj_tiles gSlotMachineNumber6Tiles, 0x0040, 0x000D
obj_tiles gSlotMachineNumber7Tiles, 0x0040, 0x000E
obj_tiles gSlotMachineNumber8Tiles, 0x0040, 0x000F
obj_tiles gSlotMachineNumber9Tiles, 0x0040, 0x0010
.align 2
.incbin "baserom.gba", 0x5a83bc, 0x28
gUnknown_085A83E4:: @ 85A83E4
.incbin "baserom.gba", 0x5a83e4, 0x24
@@ -277,8 +297,17 @@ gUnknown_085A8520:: @ 85A8520
gUnknown_085A8524:: @ 85A8524
.incbin "baserom.gba", 0x5a8524, 0x20
.align 2
gUnknown_085A8544:: @ 85A8544
.incbin "baserom.gba", 0x5a8544, 0x48
obj_pal gUnknown_08DCF170, 0
obj_pal gUnknown_08DCF190, 1
obj_pal gUnknown_08DCF1B0, 2
obj_pal gSlotMachineReelTime_Pal, 3
obj_pal gUnknown_08DCF1F0, 4
obj_pal gUnknown_08DCF210, 5
obj_pal gUnknown_08DCF230, 6
obj_pal gUnknown_08DCF1F0, 7
null_obj_pal
gUnknown_085A858C:: @ 85A858C
.incbin "baserom.gba", 0x5a858c, 0x1154
data/smokescreen.s
+3 -3
View File
@@ -14,11 +14,11 @@ gUnknown_0831C604:: @ 831C604
.align 2
gUnknown_0831C620:: @ 831C620
obj_tiles gUnknown_08C01644, 0x0180, 0xd6eb
obj_tiles gSmokescreenImpactTiles, 0x0180, 0xd6eb
.align 2
gUnknown_0831C628:: @ 831C628
obj_pal gUnknown_08C01724, 0xd6eb
obj_pal gSmokescreenImpactPalette, 0xd6eb
.align 2
gUnknown_0831C630:: @ 831C630
@@ -53,7 +53,7 @@ gUnknown_0831C688:: @ 831C688
.align 2
gSpriteSheet_EnemyShadow:: @ 831C6A0
obj_tiles gUnknown_08D8FBC0, 0x0080, 0xd759
obj_tiles gEnemyMonShadow_Gfx, 0x0080, 0xd759
.align 2
gUnknown_0831C6A8:: @ 831C6A8
data/specials.inc
+4 -4
View File
@@ -1,11 +1,11 @@
.macro def_special ptr
.set SPECIAL_\ptr, __special__
.set __special__, __special__ + 1
.4byte \ptr
.endm
.4byte \ptr
.endm
.set __special__, 0
.align 2
.align 2
gSpecials:: @ 81DBA64
def_special HealPlayerParty
def_special sub_809D2BC
@@ -163,7 +163,7 @@ gSpecials:: @ 81DBA64
def_special SetFlagInVar
def_special CableCarWarp
def_special sub_814FC9C
def_special sub_8085784
def_special Overworld_PlaySpecialMapMusic
def_special StartWallClock
def_special Special_ViewWallClock
def_special ChooseStarter
data/start_menu.s
-29
View File
@@ -1,29 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gSafariBallsWindowTemplate:: @ 8510508
.incbin "baserom.gba", 0x510508, 0x8
gUnknown_08510510:: @ 8510510
.incbin "baserom.gba", 0x510510, 0x20
gPyramidFloorWindowTemplate_2:: @ 8510530
.incbin "baserom.gba", 0x510530, 0x8
gPyramidFloorWindowTemplate_1:: @ 8510538
.incbin "baserom.gba", 0x510538, 0x8
sStartMenuItems:: @ 8510540
.incbin "baserom.gba", 0x510540, 0x68
gUnknown_085105A8:: @ 85105A8
.incbin "baserom.gba", 0x5105a8, 0x4
gUnknown_085105AC:: @ 85105AC
.incbin "baserom.gba", 0x5105ac, 0x10
gUnknown_085105BC:: @ 85105BC
.incbin "baserom.gba", 0x5105bc, 0x8
data/starter_choose.s
+5 -3
View File
@@ -1,7 +1,6 @@
@ the fourth big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "include/constants/species.h"
.section .rodata
@@ -36,8 +35,11 @@ gStarterChoose_LabelCoords:: @ 85B1DF2
.incbin "baserom.gba", 0x5b1df2, 0x6
sStarterMon:: @ 85B1DF8
.incbin "baserom.gba", 0x5b1df8, 0x8
.2byte SPECIES_TREECKO
.2byte SPECIES_TORCHIC
.2byte SPECIES_MUDKIP
.align 2
gUnknown_085B1E00:: @ 85B1E00
.incbin "baserom.gba", 0x5b1e00, 0xc
data/strings.s
+30 -31
View File
@@ -2705,34 +2705,34 @@ gUnknown_085EBB4F:: @ 85EBB4F
gUnknown_085EBB56:: @ 85EBB56
.string "What would you like to do?$"
gUnknown_085EBB71:: @ 85EBB71
gText_WithdrawPokemon:: @ 85EBB71
.string "WITHDRAW POKéMON$"
gUnknown_085EBB82:: @ 85EBB82
gText_DepositPokemon:: @ 85EBB82
.string "DEPOSIT POKéMON$"
gUnknown_085EBB92:: @ 85EBB92
gText_MovePokemon:: @ 85EBB92
.string "MOVE POKéMON$"
gUnknown_085EBB9F:: @ 85EBB9F
gText_MoveItems:: @ 85EBB9F
.string "MOVE ITEMS$"
gUnknown_085EBBAA:: @ 85EBBAA
gText_SeeYa:: @ 85EBBAA
.string "SEE YA!$"
gUnknown_085EBBB2:: @ 85EBBB2
gText_WithdrawMonDescription:: @ 85EBBB2
.string "Move POKéMON stored in BOXES to\nyour party.$"
gUnknown_085EBBDE:: @ 85EBBDE
gText_DepositMonDescription:: @ 85EBBDE
.string "Store POKéMON in your party in BOXES.$"
gUnknown_085EBC04:: @ 85EBC04
gText_MoveMonDescription:: @ 85EBC04
.string "Organize the POKéMON in BOXES and\nin your party.$"
gUnknown_085EBC35:: @ 85EBC35
gText_MoveItemsDescription:: @ 85EBC35
.string "Move items held by any POKéMON\nin a BOX or your party.$"
gUnknown_085EBC6C:: @ 85EBC6C
gText_SeeYaDescription:: @ 85EBC6C
.string "Return to the previous menu.$"
gText_JustOnePkmn:: @ 85EBC89
@@ -3521,10 +3521,10 @@ gText_Var1sTrainerCard:: @ 85ECFA6
gText_HallOfFameDebut:: @ 85ECFB8
.string "HALL OF FAME DEBUT $"
gUnknown_085ECFCD:: @ 85ECFCD
gText_LinkBattles:: @ 85ECFCD
.string "LINK BATTLES$"
gUnknown_085ECFDA:: @ 85ECFDA
gText_LinkCableBattles:: @ 85ECFDA
.string "LINK CABLE BATTLES$"
gText_WinsLosses:: @ 85ECFED
@@ -4488,34 +4488,34 @@ gUnknown_085EE6AD:: @ 85EE6AD
gUnknown_085EE6B6:: @ 85EE6B6
.string "Updated time$"
gUnknown_085EE6C3:: @ 85EE6C3
gText_MenuPokedex:: @ 85EE6C3
.string "POKéDEX$"
gUnknown_085EE6CB:: @ 85EE6CB
gText_MenuPokemon:: @ 85EE6CB
.string "POKéMON$"
gUnknown_085EE6D3:: @ 85EE6D3
gText_MenuBag:: @ 85EE6D3
.string "BAG$"
gUnknown_085EE6D7:: @ 85EE6D7
gText_MenuPokenav:: @ 85EE6D7
.string "POKéNAV$"
gUnknown_085EE6DF:: @ 85EE6DF
gText_MenuPlayer:: @ 85EE6DF
.string "{PLAYER}$"
gUnknown_085EE6E2:: @ 85EE6E2
gText_MenuSave:: @ 85EE6E2
.string "SAVE$"
gUnknown_085EE6E7:: @ 85EE6E7
gText_MenuOption:: @ 85EE6E7
.string "OPTION$"
gUnknown_085EE6EE:: @ 85EE6EE
gText_MenuExit:: @ 85EE6EE
.string "EXIT$"
gUnknown_085EE6F3:: @ 85EE6F3
gText_MenuRetire:: @ 85EE6F3
.string "RETIRE$"
gUnknown_085EE6FA:: @ 85EE6FA
gText_MenuRest:: @ 85EE6FA
.string "REST$"
gText_SafariBallStock:: @ 85EE6FF
@@ -4524,28 +4524,28 @@ gText_SafariBallStock:: @ 85EE6FF
gText_BattlePyramidFloor:: @ 85EE716
.string "Battle Pyramid\n{STR_VAR_1}$"
gUnknown_085EE728:: @ 85EE728
gText_Floor1:: @ 85EE728
.string "Floor 1$"
gUnknown_085EE730:: @ 85EE730
gText_Floor2:: @ 85EE730
.string "Floor 2$"
gUnknown_085EE738:: @ 85EE738
gText_Floor3:: @ 85EE738
.string "Floor 3$"
gUnknown_085EE740:: @ 85EE740
gText_Floor4:: @ 85EE740
.string "Floor 4$"
gUnknown_085EE748:: @ 85EE748
gText_Floor5:: @ 85EE748
.string "Floor 5$"
gUnknown_085EE750:: @ 85EE750
gText_Floor6:: @ 85EE750
.string "Floor 6$"
gUnknown_085EE758:: @ 85EE758
gText_Floor7:: @ 85EE758
.string "Floor 7$"
gUnknown_085EE760:: @ 85EE760
gText_Peak:: @ 85EE760
.string "Peak$"
gText_LinkStandby2:: @ 85EE765
@@ -5393,4 +5393,3 @@ gText_Berry:: @ 85EFCDF
gText_Berries:: @ 85EFCE5
.string "BERRIES$"
data/text_window.s
+161 -8
View File
@@ -1,17 +1,170 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
gUnknown_0850E87C:: @ 850E87C
.incbin "baserom.gba", 0x50e87c, 0x1680
.incbin "baserom.gba", 0x50e87c, 0x120
gUnknown_0850E99C:: @ 850E99C
.incbin "baserom.gba", 0x50e99c, 0x120
gUnknown_0850EABC:: @ 850EABC
.incbin "baserom.gba", 0x50eabc, 0x120
gUnknown_0850EBDC:: @ 850EBDC
.incbin "baserom.gba", 0x50ebdc, 0x120
gUnknown_0850ECFC:: @ 850ECFC
.incbin "baserom.gba", 0x50ecfc, 0x120
gUnknown_0850EE1C:: @ 850EE1C
.incbin "baserom.gba", 0x50ee1c, 0x120
gUnknown_0850EF3C:: @ 850EF3C
.incbin "baserom.gba", 0x50ef3c, 0x120
gUnknown_0850F05C:: @ 850F05C
.incbin "baserom.gba", 0x50f05c, 0x120
gUnknown_0850F17C:: @ 850F17C
.incbin "baserom.gba", 0x50f17c, 0x120
gUnknown_0850F29C:: @ 850F29C
.incbin "baserom.gba", 0x50f29c, 0x120
gUnknown_0850F3BC:: @ 850F3BC
.incbin "baserom.gba", 0x50f3bc, 0x120
gUnknown_0850F4DC:: @ 850F4DC
.incbin "baserom.gba", 0x50f4dc, 0x120
gUnknown_0850F5FC:: @ 850F5FC
.incbin "baserom.gba", 0x50f5fc, 0x120
gUnknown_0850F71C:: @ 850F71C
.incbin "baserom.gba", 0x50f71c, 0x120
gUnknown_0850F83C:: @ 850F83C
.incbin "baserom.gba", 0x50f83c, 0x120
gUnknown_0850F95C:: @ 850F95C
.incbin "baserom.gba", 0x50f95c, 0x120
gUnknown_0850FA7C:: @ 850FA7C
.incbin "baserom.gba", 0x50fa7c, 0x120
gUnknown_0850FB9C:: @ 850FB9C
.incbin "baserom.gba", 0x50fb9c, 0x120
gUnknown_0850FCBC:: @ 850FCBC
.incbin "baserom.gba", 0x50fcbc, 0x120
gUnknown_0850FDDC:: @ 850FDDC
.incbin "baserom.gba", 0x50fddc, 0x120
gUnknown_0850FEFC:: @ 850FEFC
.incbin "baserom.gba", 0x50fefc, 0x280
.incbin "baserom.gba", 0x50fefc, 0x20
gUnknown_0850FF1C:: @ 850FF1C
.incbin "baserom.gba", 0x50ff1c, 0x20
gUnknown_0850FF3C:: @ 850FF3C
.incbin "baserom.gba", 0x50ff3c, 0x20
gUnknown_0850FF5C:: @ 850FF5C
.incbin "baserom.gba", 0x50ff5c, 0x20
gUnknown_0850FF7C:: @ 850FF7C
.incbin "baserom.gba", 0x50ff7c, 0x20
gUnknown_0850FF9C:: @ 850FF9C
.incbin "baserom.gba", 0x50ff9c, 0x20
gUnknown_0850FFBC:: @ 850FFBC
.incbin "baserom.gba", 0x50ffbc, 0x20
gUnknown_0850FFDC:: @ 850FFDC
.incbin "baserom.gba", 0x50ffdc, 0x20
gUnknown_0850FFFC:: @ 850FFFC
.incbin "baserom.gba", 0x50fffc, 0x20
gUnknown_0851001C:: @ 851001C
.incbin "baserom.gba", 0x51001c, 0x20
gUnknown_0851003C:: @ 851003C
.incbin "baserom.gba", 0x51003c, 0x20
gUnknown_0851005C:: @ 851005C
.incbin "baserom.gba", 0x51005c, 0x20
gUnknown_0851007C:: @ 851007C
.incbin "baserom.gba", 0x51007c, 0x20
gUnknown_0851009C:: @ 851009C
.incbin "baserom.gba", 0x51009c, 0x20
gUnknown_085100BC:: @ 85100BC
.incbin "baserom.gba", 0x5100bc, 0x20
gUnknown_085100DC:: @ 85100DC
.incbin "baserom.gba", 0x5100dc, 0x20
gUnknown_085100FC:: @ 85100FC
.incbin "baserom.gba", 0x5100fc, 0x20
gUnknown_0851011C:: @ 851011C
.incbin "baserom.gba", 0x51011c, 0x20
gUnknown_0851013C:: @ 851013C
.incbin "baserom.gba", 0x51013c, 0x20
gUnknown_0851015C:: @ 851015C
.incbin "baserom.gba", 0x51015c, 0x20
gUnknown_0851017C:: @ 851017C
.incbin "baserom.gba", 0x51017c, 0xa0
.incbin "baserom.gba", 0x51017c, 0xA0
gUnknown_0851021C:: @ 851021C
.incbin "baserom.gba", 0x51021c, 0xa0
.4byte gUnknown_0850E87C
.4byte gUnknown_0850FEFC
.4byte gUnknown_0850E99C
.4byte gUnknown_0850FF1C
.4byte gUnknown_0850EABC
.4byte gUnknown_0850FF3C
.4byte gUnknown_0850EBDC
.4byte gUnknown_0850FF5C
.4byte gUnknown_0850ECFC
.4byte gUnknown_0850FF7C
.4byte gUnknown_0850EE1C
.4byte gUnknown_0850FF9C
.4byte gUnknown_0850EF3C
.4byte gUnknown_0850FFBC
.4byte gUnknown_0850F05C
.4byte gUnknown_0850FFDC
.4byte gUnknown_0850F17C
.4byte gUnknown_0850FFFC
.4byte gUnknown_0850F29C
.4byte gUnknown_0851001C
.4byte gUnknown_0850F3BC
.4byte gUnknown_0851003C
.4byte gUnknown_0850F4DC
.4byte gUnknown_0851005C
.4byte gUnknown_0850F5FC
.4byte gUnknown_0851007C
.4byte gUnknown_0850F71C
.4byte gUnknown_0851009C
.4byte gUnknown_0850F83C
.4byte gUnknown_085100BC
.4byte gUnknown_0850F95C
.4byte gUnknown_085100DC
.4byte gUnknown_0850FA7C
.4byte gUnknown_085100FC
.4byte gUnknown_0850FB9C
.4byte gUnknown_0851011C
.4byte gUnknown_0850FCBC
.4byte gUnknown_0851013C
.4byte gUnknown_0850FDDC
.4byte gUnknown_0851015C
data/trade.s
+4 -4
View File
@@ -1,8 +1,8 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
gUnknown_0832C6A8:: @ 832C6A8
.incbin "baserom.gba", 0x32C6A8, 0x18
data/trainer_card.s
+177 -23
View File
@@ -1,11 +1,44 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
.macro unk_trainer_card_struct text1, text2, short1, short2, short3, short4
.4byte \text1
.4byte \text2
.2byte \short1
.2byte \short2
.2byte \short3
.2byte \short4
.endm
gUnknown_0856F018:: @ 856F018
.incbin "baserom.gba", 0x56f018, 0x494
.incbin "baserom.gba", 0x56f018, 0x194
gEmeraldTrainerCard1Star_Pal:: @ 856F1AC
.incbin "baserom.gba", 0x56f1ac, 0x60
gFireRedTrainerCard1Star_Pal:: @ 856F20C
.incbin "baserom.gba", 0x56f20c, 0x60
gEmeraldTrainerCard2Star_Pal:: @ 856F26C
.incbin "baserom.gba", 0x56f26c, 0x60
gFireRedTrainerCard2Star_Pal:: @ 856F2CC
.incbin "baserom.gba", 0x56f2cc, 0x60
gEmeraldTrainerCard3Star_Pal:: @ 856F32C
.incbin "baserom.gba", 0x56f32c, 0x60
gFireRedTrainerCard3Star_Pal:: @ 856F38C
.incbin "baserom.gba", 0x56f38c, 0x60
gEmeraldTrainerCard4Star_Pal:: @ 856F3EC
.incbin "baserom.gba", 0x56f3ec, 0x60
gFireRedTrainerCard4Star_Pal:: @ 856F44C
.incbin "baserom.gba", 0x56f44c, 0x60
gUnknown_0856F4AC:: @ 856F4AC
.incbin "baserom.gba", 0x56f4ac, 0x20
@@ -46,17 +79,30 @@ gUnknown_0856FAB4:: @ 856FAB4
gUnknown_0856FAC4:: @ 856FAC4
.incbin "baserom.gba", 0x56fac4, 0x20
gUnknown_0856FAE4:: @ 856FAE4
.incbin "baserom.gba", 0x56fae4, 0x14
.align 2
gEmeraldTrainerCardStarPals:: @ 856FAE4
.4byte gEmeraldTrainerCard0Star_Pal
.4byte gEmeraldTrainerCard1Star_Pal
.4byte gEmeraldTrainerCard2Star_Pal
.4byte gEmeraldTrainerCard3Star_Pal
.4byte gEmeraldTrainerCard4Star_Pal
gUnknown_0856FAF8:: @ 856FAF8
.incbin "baserom.gba", 0x56faf8, 0x14
.align 2
gFireRedTrainerCardStarPals:: @ 856FAF8
.4byte gFireRedTrainerCard0Star_Pal
.4byte gFireRedTrainerCard1Star_Pal
.4byte gFireRedTrainerCard2Star_Pal
.4byte gFireRedTrainerCard3Star_Pal
.4byte gFireRedTrainerCard4Star_Pal
gUnknown_0856FB0C:: @ 856FB0C
.incbin "baserom.gba", 0x56fb0c, 0x3
gUnknown_0856FB0F:: @ 856FB0F
.incbin "baserom.gba", 0x56fb0f, 0x9
.incbin "baserom.gba", 0x56fb0f, 0x3
gUnknown_0856FB12:: @ 856FB12
.incbin "baserom.gba", 0x56fb12, 0x6
gUnknown_0856FB18:: @ 856FB18
.incbin "baserom.gba", 0x56fb18, 0x8
@@ -65,10 +111,16 @@ gUnknown_0856FB20:: @ 856FB20
.incbin "baserom.gba", 0x56fb20, 0x8
gUnknown_0856FB28:: @ 856FB28
.incbin "baserom.gba", 0x56fb28, 0x18
.4byte sub_80C4998
.4byte sub_80C49D8
.4byte sub_80C4B08
.4byte sub_80C4C1C
.4byte sub_80C4C84
.4byte sub_80C4DB0
gUnknown_0856FB40:: @ 856FB40
.incbin "baserom.gba", 0x56fb40, 0x8
.4byte gUnknown_0856FB0C
.4byte gUnknown_0856FB12
gUnknown_0856FB48:: @ 856FB48
.incbin "baserom.gba", 0x56fb48, 0x2
@@ -86,7 +138,9 @@ gUnknown_0856FB57:: @ 856FB57
.incbin "baserom.gba", 0x56fb57, 0x5
gUnknown_0856FB5C:: @ 856FB5C
.incbin "baserom.gba", 0x56fb5c, 0xc
.4byte gText_LinkBattles
.4byte gText_LinkCableBattles
.4byte gText_LinkBattles
gUnknown_0856FB68:: @ 856FB68
.incbin "baserom.gba", 0x56fb68, 0x6
@@ -98,10 +152,27 @@ gUnknown_0856FB74:: @ 856FB74
.incbin "baserom.gba", 0x56fb74, 0x4
gUnknown_0856FB78:: @ 856FB78
.incbin "baserom.gba", 0x56fb78, 0x44
.incbin "baserom.gba", 0x56fb78, 0x4
gUnknown_0856FB7C:: @ 856FB7C
.incbin "baserom.gba", 0x56fb7c, 0x20
gUnknown_0856FB9C:: @ 856FB9C
.incbin "baserom.gba", 0x56fb9c, 0x20
gUnknown_0856FBBC:: @ 856FBBC
.incbin "baserom.gba", 0x56fbbc, 0x1244
.incbin "baserom.gba", 0x56fbbc, 0xFEC
.align 2
gFrontierPassCursor_Gfx:: @ 8570BA8
.incbin "graphics/frontier_pass/cursor.4bpp.lz"
gUnknown_08570C44:: @ 8570C44
.incbin "baserom.gba", 0x570c44, 0xBC
.align 2
gFrontierPassMapCursor_Gfx:: @ 8570D00
.incbin "graphics/frontier_pass/map_cursor.4bpp.lz"
gUnknown_08570E00:: @ 8570E00
.incbin "baserom.gba", 0x570e00, 0x260
@@ -143,25 +214,108 @@ gUnknown_08571454:: @ 8571454
.incbin "baserom.gba", 0x571454, 0x68
gUnknown_085714BC:: @ 85714BC
.incbin "baserom.gba", 0x5714bc, 0x18
obj_tiles gFrontierPassCursor_Gfx, 0x100, 0
obj_tiles gFrontierPassMapCursor_Gfx, 0x400, 1
obj_tiles gFrontierPassMedals_Gfx, 0x380, 2
gUnknown_085714D4:: @ 85714D4
.incbin "baserom.gba", 0x5714d4, 0x10
obj_tiles gUnknown_08570C44, 0x100, 4
null_obj_tiles
gUnknown_085714E4:: @ 85714E4
.incbin "baserom.gba", 0x5714e4, 0xd0
obj_pal gFrontierPassCursor_Pal, 0
obj_pal gFrontierPassMapCursor_Pal, 1
obj_pal gFrontierPassMedalsSilver_Pal, 2
obj_pal gFrontierPassMedalsGold_Pal, 3
obj_pal gUnknown_0856FB7C, 4
obj_pal gUnknown_0856FB9C, 5
null_obj_pal
@ this doesnt look like its part of the same table.
.4byte 0x0, 0xFFFF
gUnknown_08571524:: @ 8571524
.incbin "baserom.gba", 0x571524, 0x8
gUnknown_0857152C:: @ 857152C
.incbin "baserom.gba", 0x57152c, 0x8
gUnknown_08571534:: @ 8571534
.incbin "baserom.gba", 0x571534, 0x8
gUnknown_0857153C:: @ 857153C
.incbin "baserom.gba", 0x57153c, 0x8
gUnknown_08571544:: @ 8571544
.incbin "baserom.gba", 0x571544, 0x8
gUnknown_0857154C:: @ 857154C
.incbin "baserom.gba", 0x57154c, 0x8
gUnknown_08571554:: @ 8571554
.incbin "baserom.gba", 0x571554, 0x8
gUnknown_0857155C:: @ 857155C
.incbin "baserom.gba", 0x57155c, 0xC
gUnknown_08571568:: @ 8571568
.incbin "baserom.gba", 0x571568, 0xC
gUnknown_08571574:: @ 8571574
.4byte gUnknown_08571524
.4byte gUnknown_0857152C
gUnknown_0857157C:: @ 857157C
.4byte gUnknown_08571524
.4byte gUnknown_0857152C
.4byte gUnknown_08571534
.4byte gUnknown_0857153C
.4byte gUnknown_08571544
.4byte gUnknown_0857154C
.4byte gUnknown_08571554
gUnknown_08571598:: @ 8571598
.4byte gUnknown_0857155C
.4byte gUnknown_08571568
gUnknown_085715A0:: @ 85715A0
.incbin "baserom.gba", 0x5715a0, 0x10
gUnknown_085715B0:: @ 85715B0
.4byte gUnknown_085715A0
gUnknown_085715B4:: @ 85715B4
.incbin "baserom.gba", 0x5715b4, 0x30
spr_template 0, 0, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 1, 1, gUnknown_08524934, gUnknown_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085715E4:: @ 85715E4
.incbin "baserom.gba", 0x5715e4, 0x18
spr_template 2, 2, gUnknown_0852490C, gUnknown_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085715FC:: @ 85715FC
.incbin "baserom.gba", 0x5715fc, 0x18
spr_template 4, 4, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39
gUnknown_08571614:: @ 8571614
.incbin "baserom.gba", 0x571614, 0x3c
.4byte gUnknown_085EDA96
.4byte gUnknown_085ED932
.4byte gUnknown_085ED94D
.4byte gUnknown_085ED961
.4byte gUnknown_085ED977
.4byte gUnknown_085ED993
.4byte gUnknown_085ED9AF
.4byte gUnknown_085ED9C7
.4byte gUnknown_085ED9E5
.4byte gUnknown_085EDA02
.4byte gUnknown_085EDA21
.4byte gUnknown_085EDA3C
.4byte gUnknown_085EDA5E
.4byte gUnknown_085EDA78
.4byte gUnknown_085ED931
gUnknown_08571650:: @ 8571650
.incbin "baserom.gba", 0x571650, 0x70
unk_trainer_card_struct gUnknown_085EDAB1, gUnknown_085EDB0F, 0x59, 0x28, 1, 0
unk_trainer_card_struct gUnknown_085EDABE, gUnknown_085EDB4E, 0x21, 0x2A, 1, 0
unk_trainer_card_struct gUnknown_085EDACA, gUnknown_085EDB8B, 0x78, 0x56, 0, 0
unk_trainer_card_struct gUnknown_085EDAD8, gUnknown_085EDBC2, 0x72, 0x3B, 0, 0
unk_trainer_card_struct gUnknown_085EDAE5, gUnknown_085EDC00, 0x19, 0x43, 0, 0
unk_trainer_card_struct gUnknown_085EDAF4, gUnknown_085EDC45, 0x39, 0x39, 1, 0
unk_trainer_card_struct gUnknown_085EDB00, gUnknown_085EDC84, 0x86, 0x29, 1, 0
data/trainer_money.inc
+56 -56
View File
@@ -1,59 +1,59 @@
@ This is a factor in how much money you get for beating a trainer.
.align 2
gTrainerMoneyTable:: @ 831AEB8
.byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0
.byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0
.byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0
.byte TRAINER_CLASS_NAME_TUBER_1, 1, 0, 0
.byte TRAINER_CLASS_NAME_TUBER_2, 1, 0, 0
.byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0
.byte TRAINER_CLASS_NAME_COOLTRAINER_1, 12, 0, 0
.byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0
.byte TRAINER_CLASS_NAME_LADY, 50, 0, 0
.byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0
.byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0
.byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0
.byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0
.byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0
.byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0
.byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0
.byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0
.byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0
.byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0
.byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0
.byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0
.byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0
.byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0
.byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0
.byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0
.byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0
.byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0
.byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0
.byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0
.byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0
.byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0
.byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0
.byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0
.byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0
.byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0
.byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0
.byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0
.byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0
.byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3, 15, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_BREEDER, 10, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_RANGER, 12, 0, 0
.byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0
.byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_NAME_LASS, 4, 0, 0
.byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0
.byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0
.byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0
.byte TRAINER_CLASS_LEADER_1, 10, 0, 0
.byte -1, 5, 0, 0
.byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0
.byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0
.byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0
.byte TRAINER_CLASS_NAME_TUBER_1, 1, 0, 0
.byte TRAINER_CLASS_NAME_TUBER_2, 1, 0, 0
.byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0
.byte TRAINER_CLASS_NAME_COOLTRAINER_1, 12, 0, 0
.byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0
.byte TRAINER_CLASS_NAME_LADY, 50, 0, 0
.byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0
.byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0
.byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0
.byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0
.byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0
.byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0
.byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0
.byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0
.byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0
.byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0
.byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0
.byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0
.byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0
.byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0
.byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0
.byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0
.byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0
.byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0
.byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0
.byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0
.byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0
.byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0
.byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0
.byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0
.byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0
.byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0
.byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0
.byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0
.byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0
.byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_TRAINER_3, 15, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_BREEDER, 10, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_RANGER, 12, 0, 0
.byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0
.byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_NAME_LASS, 4, 0, 0
.byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0
.byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0
.byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0
.byte TRAINER_CLASS_LEADER_1, 10, 0, 0
.byte -1, 5, 0, 0
data/type_effectiveness.inc
+96 -96
View File
@@ -1,119 +1,119 @@
@ format: attacking type, defending type, damage multiplier
@ the multiplier is a (decimal) fixed-point number:
@ 20 is ×2.0
@ 05 is ×0.5
@ 00 is ×0
@ 20 is ×2.0
@ 05 is ×0.5
@ 00 is ×0
gTypeEffectiveness:: @ 831ACE8
.byte TYPE_NORMAL, TYPE_ROCK, 5
.byte TYPE_NORMAL, TYPE_STEEL, 5
.byte TYPE_FIRE, TYPE_FIRE, 5
.byte TYPE_FIRE, TYPE_WATER, 5
.byte TYPE_FIRE, TYPE_GRASS, 20
.byte TYPE_FIRE, TYPE_ICE, 20
.byte TYPE_FIRE, TYPE_BUG, 20
.byte TYPE_FIRE, TYPE_ROCK, 5
.byte TYPE_FIRE, TYPE_DRAGON, 5
.byte TYPE_FIRE, TYPE_STEEL, 20
.byte TYPE_WATER, TYPE_FIRE, 20
.byte TYPE_WATER, TYPE_WATER, 5
.byte TYPE_WATER, TYPE_GRASS, 5
.byte TYPE_WATER, TYPE_GROUND, 20
.byte TYPE_WATER, TYPE_ROCK, 20
.byte TYPE_WATER, TYPE_DRAGON, 5
.byte TYPE_ELECTRIC, TYPE_WATER, 20
.byte TYPE_NORMAL, TYPE_ROCK, 5
.byte TYPE_NORMAL, TYPE_STEEL, 5
.byte TYPE_FIRE, TYPE_FIRE, 5
.byte TYPE_FIRE, TYPE_WATER, 5
.byte TYPE_FIRE, TYPE_GRASS, 20
.byte TYPE_FIRE, TYPE_ICE, 20
.byte TYPE_FIRE, TYPE_BUG, 20
.byte TYPE_FIRE, TYPE_ROCK, 5
.byte TYPE_FIRE, TYPE_DRAGON, 5
.byte TYPE_FIRE, TYPE_STEEL, 20
.byte TYPE_WATER, TYPE_FIRE, 20
.byte TYPE_WATER, TYPE_WATER, 5
.byte TYPE_WATER, TYPE_GRASS, 5
.byte TYPE_WATER, TYPE_GROUND, 20
.byte TYPE_WATER, TYPE_ROCK, 20
.byte TYPE_WATER, TYPE_DRAGON, 5
.byte TYPE_ELECTRIC, TYPE_WATER, 20
.byte TYPE_ELECTRIC, TYPE_ELECTRIC, 5
.byte TYPE_ELECTRIC, TYPE_GRASS, 5
.byte TYPE_ELECTRIC, TYPE_GRASS, 5
.byte TYPE_ELECTRIC, TYPE_GROUND, 0
.byte TYPE_ELECTRIC, TYPE_FLYING, 20
.byte TYPE_ELECTRIC, TYPE_DRAGON, 5
.byte TYPE_GRASS, TYPE_FIRE, 5
.byte TYPE_GRASS, TYPE_WATER, 20
.byte TYPE_GRASS, TYPE_GRASS, 5
.byte TYPE_GRASS, TYPE_POISON, 5
.byte TYPE_GRASS, TYPE_GROUND, 20
.byte TYPE_GRASS, TYPE_FLYING, 5
.byte TYPE_GRASS, TYPE_BUG, 5
.byte TYPE_GRASS, TYPE_ROCK, 20
.byte TYPE_GRASS, TYPE_DRAGON, 5
.byte TYPE_GRASS, TYPE_STEEL, 5
.byte TYPE_ICE, TYPE_WATER, 5
.byte TYPE_ICE, TYPE_GRASS, 20
.byte TYPE_ICE, TYPE_ICE, 5
.byte TYPE_ICE, TYPE_GROUND, 20
.byte TYPE_ICE, TYPE_FLYING, 20
.byte TYPE_ICE, TYPE_DRAGON, 20
.byte TYPE_ICE, TYPE_STEEL, 5
.byte TYPE_ICE, TYPE_FIRE, 5
.byte TYPE_GRASS, TYPE_FIRE, 5
.byte TYPE_GRASS, TYPE_WATER, 20
.byte TYPE_GRASS, TYPE_GRASS, 5
.byte TYPE_GRASS, TYPE_POISON, 5
.byte TYPE_GRASS, TYPE_GROUND, 20
.byte TYPE_GRASS, TYPE_FLYING, 5
.byte TYPE_GRASS, TYPE_BUG, 5
.byte TYPE_GRASS, TYPE_ROCK, 20
.byte TYPE_GRASS, TYPE_DRAGON, 5
.byte TYPE_GRASS, TYPE_STEEL, 5
.byte TYPE_ICE, TYPE_WATER, 5
.byte TYPE_ICE, TYPE_GRASS, 20
.byte TYPE_ICE, TYPE_ICE, 5
.byte TYPE_ICE, TYPE_GROUND, 20
.byte TYPE_ICE, TYPE_FLYING, 20
.byte TYPE_ICE, TYPE_DRAGON, 20
.byte TYPE_ICE, TYPE_STEEL, 5
.byte TYPE_ICE, TYPE_FIRE, 5
.byte TYPE_FIGHTING, TYPE_NORMAL, 20
.byte TYPE_FIGHTING, TYPE_ICE, 20
.byte TYPE_FIGHTING, TYPE_ICE, 20
.byte TYPE_FIGHTING, TYPE_POISON, 5
.byte TYPE_FIGHTING, TYPE_FLYING, 5
.byte TYPE_FIGHTING, TYPE_PSYCHIC, 5
.byte TYPE_FIGHTING, TYPE_BUG, 5
.byte TYPE_FIGHTING, TYPE_ROCK, 20
.byte TYPE_FIGHTING, TYPE_DARK, 20
.byte TYPE_FIGHTING, TYPE_STEEL, 20
.byte TYPE_POISON, TYPE_GRASS, 20
.byte TYPE_FIGHTING, TYPE_BUG, 5
.byte TYPE_FIGHTING, TYPE_ROCK, 20
.byte TYPE_FIGHTING, TYPE_DARK, 20
.byte TYPE_FIGHTING, TYPE_STEEL, 20
.byte TYPE_POISON, TYPE_GRASS, 20
.byte TYPE_POISON, TYPE_POISON, 5
.byte TYPE_POISON, TYPE_GROUND, 5
.byte TYPE_POISON, TYPE_ROCK, 5
.byte TYPE_POISON, TYPE_GHOST, 5
.byte TYPE_POISON, TYPE_STEEL, 0
.byte TYPE_GROUND, TYPE_FIRE, 20
.byte TYPE_POISON, TYPE_ROCK, 5
.byte TYPE_POISON, TYPE_GHOST, 5
.byte TYPE_POISON, TYPE_STEEL, 0
.byte TYPE_GROUND, TYPE_FIRE, 20
.byte TYPE_GROUND, TYPE_ELECTRIC, 20
.byte TYPE_GROUND, TYPE_GRASS, 5
.byte TYPE_GROUND, TYPE_GRASS, 5
.byte TYPE_GROUND, TYPE_POISON, 20
.byte TYPE_GROUND, TYPE_FLYING, 0
.byte TYPE_GROUND, TYPE_BUG, 5
.byte TYPE_GROUND, TYPE_ROCK, 20
.byte TYPE_GROUND, TYPE_STEEL, 20
.byte TYPE_GROUND, TYPE_BUG, 5
.byte TYPE_GROUND, TYPE_ROCK, 20
.byte TYPE_GROUND, TYPE_STEEL, 20
.byte TYPE_FLYING, TYPE_ELECTRIC, 5
.byte TYPE_FLYING, TYPE_GRASS, 20
.byte TYPE_FLYING, TYPE_GRASS, 20
.byte TYPE_FLYING, TYPE_FIGHTING, 20
.byte TYPE_FLYING, TYPE_BUG, 20
.byte TYPE_FLYING, TYPE_ROCK, 5
.byte TYPE_FLYING, TYPE_STEEL, 5
.byte TYPE_FLYING, TYPE_BUG, 20
.byte TYPE_FLYING, TYPE_ROCK, 5
.byte TYPE_FLYING, TYPE_STEEL, 5
.byte TYPE_PSYCHIC, TYPE_FIGHTING, 20
.byte TYPE_PSYCHIC, TYPE_POISON, 20
.byte TYPE_PSYCHIC, TYPE_PSYCHIC, 5
.byte TYPE_PSYCHIC, TYPE_DARK, 0
.byte TYPE_PSYCHIC, TYPE_STEEL, 5
.byte TYPE_BUG, TYPE_FIRE, 5
.byte TYPE_BUG, TYPE_GRASS, 20
.byte TYPE_BUG, TYPE_FIGHTING, 5
.byte TYPE_BUG, TYPE_POISON, 5
.byte TYPE_BUG, TYPE_FLYING, 5
.byte TYPE_BUG, TYPE_PSYCHIC, 20
.byte TYPE_BUG, TYPE_GHOST, 5
.byte TYPE_BUG, TYPE_DARK, 20
.byte TYPE_BUG, TYPE_STEEL, 5
.byte TYPE_ROCK, TYPE_FIRE, 20
.byte TYPE_ROCK, TYPE_ICE, 20
.byte TYPE_ROCK, TYPE_FIGHTING, 5
.byte TYPE_ROCK, TYPE_GROUND, 5
.byte TYPE_ROCK, TYPE_FLYING, 20
.byte TYPE_ROCK, TYPE_BUG, 20
.byte TYPE_ROCK, TYPE_STEEL, 5
.byte TYPE_GHOST, TYPE_NORMAL, 0
.byte TYPE_GHOST, TYPE_PSYCHIC, 20
.byte TYPE_GHOST, TYPE_DARK, 5
.byte TYPE_GHOST, TYPE_STEEL, 5
.byte TYPE_GHOST, TYPE_GHOST, 20
.byte TYPE_PSYCHIC, TYPE_DARK, 0
.byte TYPE_PSYCHIC, TYPE_STEEL, 5
.byte TYPE_BUG, TYPE_FIRE, 5
.byte TYPE_BUG, TYPE_GRASS, 20
.byte TYPE_BUG, TYPE_FIGHTING, 5
.byte TYPE_BUG, TYPE_POISON, 5
.byte TYPE_BUG, TYPE_FLYING, 5
.byte TYPE_BUG, TYPE_PSYCHIC, 20
.byte TYPE_BUG, TYPE_GHOST, 5
.byte TYPE_BUG, TYPE_DARK, 20
.byte TYPE_BUG, TYPE_STEEL, 5
.byte TYPE_ROCK, TYPE_FIRE, 20
.byte TYPE_ROCK, TYPE_ICE, 20
.byte TYPE_ROCK, TYPE_FIGHTING, 5
.byte TYPE_ROCK, TYPE_GROUND, 5
.byte TYPE_ROCK, TYPE_FLYING, 20
.byte TYPE_ROCK, TYPE_BUG, 20
.byte TYPE_ROCK, TYPE_STEEL, 5
.byte TYPE_GHOST, TYPE_NORMAL, 0
.byte TYPE_GHOST, TYPE_PSYCHIC, 20
.byte TYPE_GHOST, TYPE_DARK, 5
.byte TYPE_GHOST, TYPE_STEEL, 5
.byte TYPE_GHOST, TYPE_GHOST, 20
.byte TYPE_DRAGON, TYPE_DRAGON, 20
.byte TYPE_DRAGON, TYPE_STEEL, 5
.byte TYPE_DARK, TYPE_FIGHTING, 5
.byte TYPE_DARK, TYPE_PSYCHIC, 20
.byte TYPE_DARK, TYPE_GHOST, 20
.byte TYPE_DARK, TYPE_DARK, 5
.byte TYPE_DARK, TYPE_STEEL, 5
.byte TYPE_STEEL, TYPE_FIRE, 5
.byte TYPE_STEEL, TYPE_WATER, 5
.byte TYPE_STEEL, TYPE_ELECTRIC, 5
.byte TYPE_STEEL, TYPE_ICE, 20
.byte TYPE_STEEL, TYPE_ROCK, 20
.byte TYPE_STEEL, TYPE_STEEL, 5
.byte 0xFE, 0xFE, 0
.byte TYPE_NORMAL, TYPE_GHOST, 0
.byte TYPE_FIGHTING, TYPE_GHOST, 0
.byte 0xFF, 0xFF, 0
.byte TYPE_DRAGON, TYPE_STEEL, 5
.byte TYPE_DARK, TYPE_FIGHTING, 5
.byte TYPE_DARK, TYPE_PSYCHIC, 20
.byte TYPE_DARK, TYPE_GHOST, 20
.byte TYPE_DARK, TYPE_DARK, 5
.byte TYPE_DARK, TYPE_STEEL, 5
.byte TYPE_STEEL, TYPE_FIRE, 5
.byte TYPE_STEEL, TYPE_WATER, 5
.byte TYPE_STEEL, TYPE_ELECTRIC, 5
.byte TYPE_STEEL, TYPE_ICE, 20
.byte TYPE_STEEL, TYPE_ROCK, 20
.byte TYPE_STEEL, TYPE_STEEL, 5
.byte 0xFE, 0xFE, 0
.byte TYPE_NORMAL, TYPE_GHOST, 0
.byte TYPE_FIGHTING, TYPE_GHOST, 0
.byte 0xFF, 0xFF, 0
data/unk_sprite_file.s
+25 -5
View File
@@ -7,16 +7,36 @@ gUnknown_0862AD54:: @ 862AD54
.incbin "baserom.gba", 0x62ad54, 0x1dc
gUnknown_0862AF30:: @ 862AF30
.incbin "baserom.gba", 0x62af30, 0x60c
.incbin "baserom.gba", 0x62af30, 0x1AC
gUnknown_0862B0DC:: @ 862B0DC
.incbin "baserom.gba", 0x62b0dc, 0x460
gUnknown_0862B53C:: @ 862B53C
.incbin "baserom.gba", 0x62b53c, 0x1e8
.incbin "baserom.gba", 0x62b53c, 0x1E0
gUnknown_0862B71C:: @ 862B71C
.incbin "baserom.gba", 0x62b71c, 0x8
gUnknown_0862B724:: @ 862B724
.incbin "baserom.gba", 0x62b724, 0x8
obj_tiles gUnknown_0862B0DC, 0x1800, 11920
gUnknown_0862B72C:: @ 862B72C
.incbin "baserom.gba", 0x62b72c, 0x2c
obj_pal gUnknown_0862B53C, 11920
gUnknown_0862B734:: @ 862B734
.incbin "baserom.gba", 0x62b734, 0x8
gUnknown_0862B73C:: @ 862B73C
.incbin "baserom.gba", 0x62b73c, 0x8
gUnknown_0862B744:: @ 862B744
.incbin "baserom.gba", 0x62b744, 0x8
gUnknown_0862B74C:: @ 862B74C
.4byte gUnknown_0862B734
.4byte gUnknown_0862B73C
.4byte gUnknown_0862B744
gUnknown_0862B758:: @ 862B758
.incbin "baserom.gba", 0x62b758, 0x18
spr_template 11920, 11920, gUnknown_0862B71C, gUnknown_0862B74C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/use_pokeblock.s
+4 -3
View File
@@ -47,10 +47,10 @@ sContestStatNames:: @ 85DFD04
.4byte gText_Beauty3
gUnknown_085DFD18:: @ 85DFD18
.incbin "baserom.gba", 0x5dfd18, 0x8
obj_tiles gUsePokeblockUpDown_Gfx, 0x200, 0
gUnknown_085DFD20:: @ 85DFD20
.incbin "baserom.gba", 0x5dfd20, 0x8
obj_pal gUsePokeblockUpDown_Pal, 0
gUnknown_085DFD28:: @ 85DFD28
.incbin "baserom.gba", 0x5dfd28, 0x34
@@ -62,4 +62,5 @@ gUnknown_085DFDA0:: @ 85DFDA0
.incbin "baserom.gba", 0x5dfda0, 0x18
gUnknown_085DFDB8:: @ 85DFDB8
.incbin "baserom.gba", 0x5dfdb8, 0x8
.4byte gUsePokeblockCondition_Pal
.4byte 1
data/wild_encounter.s
+4 -4
View File
@@ -1,9 +1,9 @@
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
@ 85507E4
.include "data/wild_mons.inc"
graphics/battle_anims/backgrounds/00.bin
Executable
BIN
View File
Binary file not shown.
graphics/battle_anims/backgrounds/00.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1021 B

graphics/battle_anims/backgrounds/02.bin
Executable
BIN
View File
Binary file not shown.
Loaded 100 of 1232 files, more files were not shown because too many files have changed in this diff. Show more