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

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

Browse Source
This commit is contained in:
Diegoisawesome
2017-12-28 03:00:15 -06:00
parent 2d04eb22ab 87958f2f87
commit 1496ea3a24
67 changed files with 10850 additions and 4312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bike.s
-2199
View File
File diff suppressed because it is too large Load Diff
asm/field_control_avatar.s
+1 -1
View File
@@ -62,7 +62,7 @@ _0809BF3C:
cmp r6, 0 cmp r6, 0
bne _0809BFA2 bne _0809BFA2
_0809BF40: _0809BF40:
bl sub_811A138 bl GetPlayerSpeed
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
cmp r0, 0x4 cmp r0, 0x4
asm/field_effect.s
+6 -6
View File
@@ -2027,7 +2027,7 @@ _080B6A8A:
thumb_func_start mapldr_08084390 thumb_func_start mapldr_08084390
mapldr_08084390: @ 80B6AA4 mapldr_08084390: @ 80B6AA4
push {r4,lr} push {r4,lr}
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_black bl pal_fill_black
ldr r0, =c3_080843F8 ldr r0, =c3_080843F8
movs r1, 0 movs r1, 0
@@ -2113,7 +2113,7 @@ _080B6B58:
thumb_func_start sub_80B6B68 thumb_func_start sub_80B6B68
sub_80B6B68: @ 80B6B68 sub_80B6B68: @ 80B6B68
push {lr} push {lr}
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights bl pal_fill_for_maplights
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl FreezeMapObjects bl FreezeMapObjects
@@ -2780,7 +2780,7 @@ _080B709C:
thumb_func_start sub_80B70B4 thumb_func_start sub_80B70B4
sub_80B70B4: @ 80B70B4 sub_80B70B4: @ 80B70B4
push {lr} push {lr}
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights bl pal_fill_for_maplights
bl ScriptContext2_Enable bl ScriptContext2_Enable
ldr r0, =sub_80B70DC ldr r0, =sub_80B70DC
@@ -3747,7 +3747,7 @@ _080B784C:
thumb_func_start mapldr_080851BC thumb_func_start mapldr_080851BC
mapldr_080851BC: @ 80B7868 mapldr_080851BC: @ 80B7868
push {lr} push {lr}
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights bl pal_fill_for_maplights
bl ScriptContext2_Enable bl ScriptContext2_Enable
ldr r0, =gFieldCallback ldr r0, =gFieldCallback
@@ -4458,7 +4458,7 @@ _080B7E40:
thumb_func_start mapldr_080859D4 thumb_func_start mapldr_080859D4
mapldr_080859D4: @ 80B7E48 mapldr_080859D4: @ 80B7E48
push {lr} push {lr}
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights bl pal_fill_for_maplights
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl FreezeMapObjects bl FreezeMapObjects
@@ -4903,7 +4903,7 @@ _080B81E6:
thumb_func_start mapldr_08085D88 thumb_func_start mapldr_08085D88
mapldr_08085D88: @ 80B8200 mapldr_08085D88: @ 80B8200
push {lr} push {lr}
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights bl pal_fill_for_maplights
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl FreezeMapObjects bl FreezeMapObjects
asm/field_player_avatar.s
+88 -88
View File
@@ -57,7 +57,7 @@ player_step: @ 808A9C0
bne _0808AA26 bne _0808AA26
adds r0, r7, 0 adds r0, r7, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8119C3C bl Bike_TryAcroBikeHistoryUpdate
adds r0, r5, 0 adds r0, r5, 0
mov r1, r8 mov r1, r8
bl TryInterruptFieldObjectSpecialAnim bl TryInterruptFieldObjectSpecialAnim
@@ -405,7 +405,7 @@ DoForcedMovementInCurrentDirection: @ 808AC58
thumb_func_start ForcedMovement_Slip thumb_func_start ForcedMovement_Slip
ForcedMovement_Slip: @ 808AC8C ForcedMovement_Slip: @ 808AC8C
push {lr} push {lr}
ldr r0, =PlayerGoSpeed1 ldr r0, =PlayerGoSpeed2
bl DoForcedMovementInCurrentDirection bl DoForcedMovementInCurrentDirection
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -417,7 +417,7 @@ ForcedMovement_Slip: @ 808AC8C
thumb_func_start ForcedMovement_WalkSouth thumb_func_start ForcedMovement_WalkSouth
ForcedMovement_WalkSouth: @ 808ACA0 ForcedMovement_WalkSouth: @ 808ACA0
push {lr} push {lr}
ldr r1, =PlayerGoSpeed0 ldr r1, =PlayerGoSpeed1
movs r0, 0x1 movs r0, 0x1
bl DoForcedMovement bl DoForcedMovement
lsls r0, 24 lsls r0, 24
@@ -430,7 +430,7 @@ ForcedMovement_WalkSouth: @ 808ACA0
thumb_func_start ForcedMovement_WalkNorth thumb_func_start ForcedMovement_WalkNorth
ForcedMovement_WalkNorth: @ 808ACB8 ForcedMovement_WalkNorth: @ 808ACB8
push {lr} push {lr}
ldr r1, =PlayerGoSpeed0 ldr r1, =PlayerGoSpeed1
movs r0, 0x2 movs r0, 0x2
bl DoForcedMovement bl DoForcedMovement
lsls r0, 24 lsls r0, 24
@@ -443,7 +443,7 @@ ForcedMovement_WalkNorth: @ 808ACB8
thumb_func_start ForcedMovement_WalkWest thumb_func_start ForcedMovement_WalkWest
ForcedMovement_WalkWest: @ 808ACD0 ForcedMovement_WalkWest: @ 808ACD0
push {lr} push {lr}
ldr r1, =PlayerGoSpeed0 ldr r1, =PlayerGoSpeed1
movs r0, 0x3 movs r0, 0x3
bl DoForcedMovement bl DoForcedMovement
lsls r0, 24 lsls r0, 24
@@ -456,7 +456,7 @@ ForcedMovement_WalkWest: @ 808ACD0
thumb_func_start ForcedMovement_WalkEast thumb_func_start ForcedMovement_WalkEast
ForcedMovement_WalkEast: @ 808ACE8 ForcedMovement_WalkEast: @ 808ACE8
push {lr} push {lr}
ldr r1, =PlayerGoSpeed0 ldr r1, =PlayerGoSpeed1
movs r0, 0x4 movs r0, 0x4
bl DoForcedMovement bl DoForcedMovement
lsls r0, 24 lsls r0, 24
@@ -469,7 +469,7 @@ ForcedMovement_WalkEast: @ 808ACE8
thumb_func_start ForcedMovement_PushedSouthByCurrent thumb_func_start ForcedMovement_PushedSouthByCurrent
ForcedMovement_PushedSouthByCurrent: @ 808AD00 ForcedMovement_PushedSouthByCurrent: @ 808AD00
push {lr} push {lr}
ldr r1, =PlayerGoSpeed2 ldr r1, =PlayerGoSpeed3
movs r0, 0x1 movs r0, 0x1
bl DoForcedMovement bl DoForcedMovement
lsls r0, 24 lsls r0, 24
@@ -482,7 +482,7 @@ ForcedMovement_PushedSouthByCurrent: @ 808AD00
thumb_func_start ForcedMovement_PushedNorthByCurrent thumb_func_start ForcedMovement_PushedNorthByCurrent
ForcedMovement_PushedNorthByCurrent: @ 808AD18 ForcedMovement_PushedNorthByCurrent: @ 808AD18
push {lr} push {lr}
ldr r1, =PlayerGoSpeed2 ldr r1, =PlayerGoSpeed3
movs r0, 0x2 movs r0, 0x2
bl DoForcedMovement bl DoForcedMovement
lsls r0, 24 lsls r0, 24
@@ -495,7 +495,7 @@ ForcedMovement_PushedNorthByCurrent: @ 808AD18
thumb_func_start ForcedMovement_PushedWestByCurrent thumb_func_start ForcedMovement_PushedWestByCurrent
ForcedMovement_PushedWestByCurrent: @ 808AD30 ForcedMovement_PushedWestByCurrent: @ 808AD30
push {lr} push {lr}
ldr r1, =PlayerGoSpeed2 ldr r1, =PlayerGoSpeed3
movs r0, 0x3 movs r0, 0x3
bl DoForcedMovement bl DoForcedMovement
lsls r0, 24 lsls r0, 24
@@ -508,7 +508,7 @@ ForcedMovement_PushedWestByCurrent: @ 808AD30
thumb_func_start ForcedMovement_PushedEastByCurrent thumb_func_start ForcedMovement_PushedEastByCurrent
ForcedMovement_PushedEastByCurrent: @ 808AD48 ForcedMovement_PushedEastByCurrent: @ 808AD48
push {lr} push {lr}
ldr r1, =PlayerGoSpeed2 ldr r1, =PlayerGoSpeed3
movs r0, 0x4 movs r0, 0x4
bl DoForcedMovement bl DoForcedMovement
lsls r0, 24 lsls r0, 24
@@ -548,7 +548,7 @@ ForcedMovement_Slide: @ 808AD60
thumb_func_start ForcedMovement_SlideSouth thumb_func_start ForcedMovement_SlideSouth
ForcedMovement_SlideSouth: @ 808AD98 ForcedMovement_SlideSouth: @ 808AD98
push {lr} push {lr}
ldr r1, =PlayerGoSpeed1 ldr r1, =PlayerGoSpeed2
movs r0, 0x1 movs r0, 0x1
bl ForcedMovement_Slide bl ForcedMovement_Slide
lsls r0, 24 lsls r0, 24
@@ -561,7 +561,7 @@ ForcedMovement_SlideSouth: @ 808AD98
thumb_func_start ForcedMovement_SlideNorth thumb_func_start ForcedMovement_SlideNorth
ForcedMovement_SlideNorth: @ 808ADB0 ForcedMovement_SlideNorth: @ 808ADB0
push {lr} push {lr}
ldr r1, =PlayerGoSpeed1 ldr r1, =PlayerGoSpeed2
movs r0, 0x2 movs r0, 0x2
bl ForcedMovement_Slide bl ForcedMovement_Slide
lsls r0, 24 lsls r0, 24
@@ -574,7 +574,7 @@ ForcedMovement_SlideNorth: @ 808ADB0
thumb_func_start ForcedMovement_SlideWest thumb_func_start ForcedMovement_SlideWest
ForcedMovement_SlideWest: @ 808ADC8 ForcedMovement_SlideWest: @ 808ADC8
push {lr} push {lr}
ldr r1, =PlayerGoSpeed1 ldr r1, =PlayerGoSpeed2
movs r0, 0x3 movs r0, 0x3
bl ForcedMovement_Slide bl ForcedMovement_Slide
lsls r0, 24 lsls r0, 24
@@ -587,7 +587,7 @@ ForcedMovement_SlideWest: @ 808ADC8
thumb_func_start ForcedMovement_SlideEast thumb_func_start ForcedMovement_SlideEast
ForcedMovement_SlideEast: @ 808ADE0 ForcedMovement_SlideEast: @ 808ADE0
push {lr} push {lr}
ldr r1, =PlayerGoSpeed1 ldr r1, =PlayerGoSpeed2
movs r0, 0x4 movs r0, 0x4
bl ForcedMovement_Slide bl ForcedMovement_Slide
lsls r0, 24 lsls r0, 24
@@ -630,19 +630,19 @@ ForcedMovement_MuddySlope: @ 808AE10
ands r0, r1 ands r0, r1
cmp r0, 0x20 cmp r0, 0x20
bne _0808AE36 bne _0808AE36
bl sub_811A138 bl GetPlayerSpeed
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
cmp r0, 0x3 cmp r0, 0x3
bgt _0808AE60 bgt _0808AE60
_0808AE36: _0808AE36:
movs r0, 0 movs r0, 0
bl sub_811A114 bl Bike_UpdateBikeCounterSpeed
ldrb r0, [r4, 0x1] ldrb r0, [r4, 0x1]
movs r1, 0x2 movs r1, 0x2
orrs r0, r1 orrs r0, r1
strb r0, [r4, 0x1] strb r0, [r4, 0x1]
ldr r1, =PlayerGoSpeed1 ldr r1, =PlayerGoSpeed2
movs r0, 0x1 movs r0, 0x1
bl DoForcedMovement bl DoForcedMovement
lsls r0, 24 lsls r0, 24
@@ -791,7 +791,7 @@ _0808AF4E:
cmp r0, 0 cmp r0, 0
beq _0808AF68 beq _0808AF68
adds r0, r5, 0 adds r0, r5, 0
bl PlayerGoSpeed1 bl PlayerGoSpeed2
b _0808AFB6 b _0808AFB6
.pool .pool
_0808AF68: _0808AF68:
@@ -829,7 +829,7 @@ _0808AF68:
.pool .pool
_0808AFB0: _0808AFB0:
adds r0, r5, 0 adds r0, r5, 0
bl PlayerGoSpeed0 bl PlayerGoSpeed1
_0808AFB6: _0808AFB6:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
@@ -1471,7 +1471,7 @@ PlayerAvatarTransition_MachBike: @ 808B46C
bl SetPlayerAvatarStateMask bl SetPlayerAvatarStateMask
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_811A0D0 bl BikeClearState
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1497,8 +1497,8 @@ PlayerAvatarTransition_AcroBike: @ 808B4A0
bl SetPlayerAvatarStateMask bl SetPlayerAvatarStateMask
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_811A0D0 bl BikeClearState
bl sub_811A188 bl Bike_HandleBumpySlopeJump
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1774,9 +1774,9 @@ sub_808B6BC: @ 808B6BC
.pool .pool
thumb_func_end sub_808B6BC thumb_func_end sub_808B6BC
thumb_func_start player_npc_set_state_and_x22_etc thumb_func_start PlayerSetAnimId
@ void player_npc_set_state_and_x22_etc(u8 animState, u8 a2) @ void PlayerSetAnimId(u8 animState, u8 a2)
player_npc_set_state_and_x22_etc: @ 808B6E4 PlayerSetAnimId: @ 808B6E4
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -1802,11 +1802,11 @@ _0808B712:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end player_npc_set_state_and_x22_etc thumb_func_end PlayerSetAnimId
thumb_func_start PlayerGoSpeed0 thumb_func_start PlayerGoSpeed1
@ void PlayerGoSpeed0(u8 direction) @ void PlayerGoSpeed1(u8 direction)
PlayerGoSpeed0: @ 808B720 PlayerGoSpeed1: @ 808B720
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1814,14 +1814,14 @@ PlayerGoSpeed0: @ 808B720
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end PlayerGoSpeed0 thumb_func_end PlayerGoSpeed1
thumb_func_start PlayerGoSpeed1 thumb_func_start PlayerGoSpeed2
@ void PlayerGoSpeed1(u8 direction) @ void PlayerGoSpeed2(u8 direction)
PlayerGoSpeed1: @ 808B738 PlayerGoSpeed2: @ 808B738
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1829,14 +1829,14 @@ PlayerGoSpeed1: @ 808B738
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end PlayerGoSpeed1 thumb_func_end PlayerGoSpeed2
thumb_func_start PlayerGoSpeed2 thumb_func_start PlayerGoSpeed3
@ void PlayerGoSpeed2(u8 direction) @ void PlayerGoSpeed3(u8 direction)
PlayerGoSpeed2: @ 808B750 PlayerGoSpeed3: @ 808B750
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1844,14 +1844,14 @@ PlayerGoSpeed2: @ 808B750
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end PlayerGoSpeed2 thumb_func_end PlayerGoSpeed3
thumb_func_start PlayerGoSpeed3 thumb_func_start PlayerGoSpeed4
@ void PlayerGoSpeed3(u8 direction) @ void PlayerGoSpeed4(u8 direction)
PlayerGoSpeed3: @ 808B768 PlayerGoSpeed4: @ 808B768
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -1859,10 +1859,10 @@ PlayerGoSpeed3: @ 808B768
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end PlayerGoSpeed3 thumb_func_end PlayerGoSpeed4
thumb_func_start PlayerRun thumb_func_start PlayerRun
@ void PlayerRun(u8 direction) @ void PlayerRun(u8 direction)
@@ -1874,7 +1874,7 @@ PlayerRun: @ 808B780
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end PlayerRun thumb_func_end PlayerRun
@@ -1893,7 +1893,7 @@ PlayerOnBikeCollide: @ 808B798
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1909,7 +1909,7 @@ PlayerOnBikeCollideWithFarawayIslandMew: @ 808B7BC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end PlayerOnBikeCollideWithFarawayIslandMew thumb_func_end PlayerOnBikeCollideWithFarawayIslandMew
@@ -1928,7 +1928,7 @@ PlayerNotOnBikeCollide: @ 808B7D4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -1944,7 +1944,7 @@ PlayerNotOnBikeCollideWithFarawayIslandMew: @ 808B7F8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end PlayerNotOnBikeCollideWithFarawayIslandMew thumb_func_end PlayerNotOnBikeCollideWithFarawayIslandMew
@@ -1959,7 +1959,7 @@ PlayerFaceDirection: @ 808B810
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end PlayerFaceDirection thumb_func_end PlayerFaceDirection
@@ -1974,7 +1974,7 @@ PlayerTurnInPlace: @ 808B828
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end PlayerTurnInPlace thumb_func_end PlayerTurnInPlace
@@ -1993,7 +1993,7 @@ PlayerJumpLedge: @ 808B840
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x8 movs r1, 0x8
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -2033,8 +2033,8 @@ _0808B89A:
.pool .pool
thumb_func_end sub_808B864 thumb_func_end sub_808B864
thumb_func_start sub_808B8A8 thumb_func_start PlayerIdleWheelie
sub_808B8A8: @ 808B8A8 PlayerIdleWheelie: @ 808B8A8
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2042,13 +2042,13 @@ sub_808B8A8: @ 808B8A8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_808B8A8 thumb_func_end PlayerIdleWheelie
thumb_func_start sub_808B8C0 thumb_func_start PlayerStartWheelie
sub_808B8C0: @ 808B8C0 PlayerStartWheelie: @ 808B8C0
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2056,13 +2056,13 @@ sub_808B8C0: @ 808B8C0
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_808B8C0 thumb_func_end PlayerStartWheelie
thumb_func_start sub_808B8D8 thumb_func_start PlayerEndWheelie
sub_808B8D8: @ 808B8D8 PlayerEndWheelie: @ 808B8D8
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -2070,13 +2070,13 @@ sub_808B8D8: @ 808B8D8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_808B8D8 thumb_func_end PlayerEndWheelie
thumb_func_start sub_808B8F0 thumb_func_start PlayerStandingHoppingWheelie
sub_808B8F0: @ 808B8F0 PlayerStandingHoppingWheelie: @ 808B8F0
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@@ -2088,14 +2088,14 @@ sub_808B8F0: @ 808B8F0
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_808B8F0 thumb_func_end PlayerStandingHoppingWheelie
thumb_func_start sub_808B914 thumb_func_start PlayerMovingHoppingWheelie
sub_808B914: @ 808B914 PlayerMovingHoppingWheelie: @ 808B914
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@@ -2107,14 +2107,14 @@ sub_808B914: @ 808B914
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_808B914 thumb_func_end PlayerMovingHoppingWheelie
thumb_func_start sub_808B938 thumb_func_start PlayerLedgeHoppingWheelie
sub_808B938: @ 808B938 PlayerLedgeHoppingWheelie: @ 808B938
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@@ -2126,14 +2126,14 @@ sub_808B938: @ 808B938
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x8 movs r1, 0x8
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_808B938 thumb_func_end PlayerLedgeHoppingWheelie
thumb_func_start sub_808B95C thumb_func_start PlayerAcroTurnJump
sub_808B95C: @ 808B95C PlayerAcroTurnJump: @ 808B95C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@@ -2145,11 +2145,11 @@ sub_808B95C: @ 808B95C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_808B95C thumb_func_end PlayerAcroTurnJump
thumb_func_start sub_808B980 thumb_func_start sub_808B980
sub_808B980: @ 808B980 sub_808B980: @ 808B980
@@ -2164,7 +2164,7 @@ sub_808B980: @ 808B980
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -2179,7 +2179,7 @@ sub_808B9A4: @ 808B9A4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_808B9A4 thumb_func_end sub_808B9A4
@@ -2193,7 +2193,7 @@ sub_808B9BC: @ 808B9BC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_808B9BC thumb_func_end sub_808B9BC
@@ -2207,7 +2207,7 @@ npc_use_some_d2s: @ 808B9D4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl player_npc_set_state_and_x22_etc bl PlayerSetAnimId
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end npc_use_some_d2s thumb_func_end npc_use_some_d2s
@@ -2592,9 +2592,9 @@ sub_808BCF4: @ 808BCF4
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0808BD2C beq _0808BD2C
bl sub_811A188 bl Bike_HandleBumpySlopeJump
movs r0, 0 movs r0, 0
bl sub_811A114 bl Bike_UpdateBikeCounterSpeed
_0808BD2C: _0808BD2C:
pop {r4} pop {r4}
pop {r0} pop {r0}
asm/field_screen.s
+10 -10
View File
@@ -7975,7 +7975,7 @@ _080AF120:
sub_80AF128: @ 80AF128 sub_80AF128: @ 80AF128
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_black bl pal_fill_black
ldr r0, =task0A_nop_for_a_while ldr r0, =task0A_nop_for_a_while
movs r1, 0xA movs r1, 0xA
@@ -8006,7 +8006,7 @@ _080AF160:
sub_80AF168: @ 80AF168 sub_80AF168: @ 80AF168
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_black bl pal_fill_black
ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running
movs r1, 0xA movs r1, 0xA
@@ -8092,7 +8092,7 @@ _080AF20E:
sub_80AF214: @ 80AF214 sub_80AF214: @ 80AF214
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl palette_bg_faded_fill_black bl palette_bg_faded_fill_black
ldr r0, =task_mpl_807DD60 ldr r0, =task_mpl_807DD60
movs r1, 0xA movs r1, 0xA
@@ -8220,7 +8220,7 @@ _080AF30C:
sub_80AF314: @ 80AF314 sub_80AF314: @ 80AF314
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl palette_bg_faded_fill_black bl palette_bg_faded_fill_black
ldr r0, =sub_80AF234 ldr r0, =sub_80AF234
movs r1, 0xA movs r1, 0xA
@@ -8279,7 +8279,7 @@ _080AF37E:
thumb_func_start mapldr_default thumb_func_start mapldr_default
mapldr_default: @ 80AF398 mapldr_default: @ 80AF398
push {lr} push {lr}
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights bl pal_fill_for_maplights
bl sub_80AF334 bl sub_80AF334
bl ScriptContext2_Enable bl ScriptContext2_Enable
@@ -8290,7 +8290,7 @@ mapldr_default: @ 80AF398
thumb_func_start sub_80AF3B0 thumb_func_start sub_80AF3B0
sub_80AF3B0: @ 80AF3B0 sub_80AF3B0: @ 80AF3B0
push {lr} push {lr}
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl sub_80AF08C bl sub_80AF08C
bl sub_80AF334 bl sub_80AF334
bl ScriptContext2_Enable bl ScriptContext2_Enable
@@ -8304,7 +8304,7 @@ sub_80AF3C8: @ 80AF3C8
bl sub_81D6534 bl sub_81D6534
cmp r0, 0 cmp r0, 0
bne _080AF3D6 bne _080AF3D6
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
_080AF3D6: _080AF3D6:
bl pal_fill_black bl pal_fill_black
bl sub_80AF334 bl sub_80AF334
@@ -8316,7 +8316,7 @@ _080AF3D6:
thumb_func_start sub_80AF3E8 thumb_func_start sub_80AF3E8
sub_80AF3E8: @ 80AF3E8 sub_80AF3E8: @ 80AF3E8
push {lr} push {lr}
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights bl pal_fill_for_maplights
movs r0, 0x2E movs r0, 0x2E
bl PlaySE bl PlaySE
@@ -8332,7 +8332,7 @@ sub_80AF3E8: @ 80AF3E8
thumb_func_start sub_80AF40C thumb_func_start sub_80AF40C
sub_80AF40C: @ 80AF40C sub_80AF40C: @ 80AF40C
push {lr} push {lr}
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights bl pal_fill_for_maplights
movs r0, 0x2E movs r0, 0x2E
bl PlaySE bl PlaySE
@@ -8680,7 +8680,7 @@ sub_80AF6D4: @ 80AF6D4
sub_80AF6F0: @ 80AF6F0 sub_80AF6F0: @ 80AF6F0
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl pal_fill_black bl pal_fill_black
ldr r0, =task_mpl_807E3C8 ldr r0, =task_mpl_807E3C8
movs r1, 0xA movs r1, 0xA
asm/field_specials.s
+5 -5
View File
@@ -32,10 +32,10 @@ Special_ViewWallClock: @ 8137CC8
thumb_func_start ResetCyclingRoadChallengeData thumb_func_start ResetCyclingRoadChallengeData
ResetCyclingRoadChallengeData: @ 8137CEC ResetCyclingRoadChallengeData: @ 8137CEC
ldr r0, =gUnknown_0203AB54 ldr r0, =gBikeCyclingChallenge
movs r1, 0 movs r1, 0
strb r1, [r0] strb r1, [r0]
ldr r0, =gUnknown_0203AB55 ldr r0, =0x0203ab55
strb r1, [r0] strb r1, [r0]
ldr r1, =gUnknown_0203AB58 ldr r1, =gUnknown_0203AB58
movs r0, 0 movs r0, 0
@@ -46,10 +46,10 @@ ResetCyclingRoadChallengeData: @ 8137CEC
thumb_func_start Special_BeginCyclingRoadChallenge thumb_func_start Special_BeginCyclingRoadChallenge
Special_BeginCyclingRoadChallenge: @ 8137D0C Special_BeginCyclingRoadChallenge: @ 8137D0C
ldr r1, =gUnknown_0203AB54 ldr r1, =gBikeCyclingChallenge
movs r0, 0x1 movs r0, 0x1
strb r0, [r1] strb r0, [r1]
ldr r1, =gUnknown_0203AB55 ldr r1, =0x0203ab55
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
ldr r1, =gUnknown_0203AB58 ldr r1, =gUnknown_0203AB58
@@ -218,7 +218,7 @@ FinishCyclingRoadChallenge: @ 8137E6C
ldr r4, [r0, 0x20] ldr r4, [r0, 0x20]
ldr r0, [r1] ldr r0, [r1]
subs r4, r0 subs r4, r0
ldr r5, =gUnknown_0203AB55 ldr r5, =0x0203ab55
ldrb r1, [r5] ldrb r1, [r5]
adds r0, r4, 0 adds r0, r4, 0
bl DetermineCyclingRoadResults bl DetermineCyclingRoadResults
asm/field_tasks.s
+1 -1
View File
@@ -1662,7 +1662,7 @@ _0809E572:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0809E5D2 beq _0809E5D2
bl sub_811A138 bl GetPlayerSpeed
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
cmp r0, 0x4 cmp r0, 0x4
asm/hof_pc.s
+1 -1
View File
@@ -34,7 +34,7 @@ ReshowPCMenuAfterHallOfFamePC: @ 8137C5C
push {lr} push {lr}
sub sp, 0x4 sub sp, 0x4
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
bl sp109_CreatePCMenu bl sp109_CreatePCMenu
bl sub_80E2514 bl sub_80E2514
movs r0, 0x1 movs r0, 0x1
asm/item_use.s
+1 -1
View File
@@ -354,7 +354,7 @@ _080FD320:
bl sav1_map_is_biking_allowed bl sav1_map_is_biking_allowed
cmp r0, 0x1 cmp r0, 0x1
bne _080FD348 bne _080FD348
bl sub_8119FF8 bl IsBikingDisallowedByPlayer
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FD348 bne _080FD348
asm/overworld.s
+3 -3
View File
@@ -2212,8 +2212,8 @@ call_ResetMapMusic: @ 8085778
bx r0 bx r0
thumb_func_end call_ResetMapMusic thumb_func_end call_ResetMapMusic
thumb_func_start sub_8085784 thumb_func_start Overworld_PlaySpecialMapMusic
sub_8085784: @ 8085784 Overworld_PlaySpecialMapMusic: @ 8085784
push {r4,lr} push {r4,lr}
bl sav1_map_get_music bl sav1_map_get_music
lsls r0, 16 lsls r0, 16
@@ -2261,7 +2261,7 @@ _080857E8:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8085784 thumb_func_end Overworld_PlaySpecialMapMusic
thumb_func_start Overworld_SetSavedMusic thumb_func_start Overworld_SetSavedMusic
Overworld_SetSavedMusic: @ 80857F4 Overworld_SetSavedMusic: @ 80857F4
asm/pokedex.s
+14 -14
View File
@@ -2028,7 +2028,7 @@ _080BC56E:
bl SetGpuReg bl SetGpuReg
movs r0, 0 movs r0, 0
bl ResetBgsAndClearDma3BusyFlags bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0855D298 ldr r1, =gBgTemplates_0855D298
movs r0, 0 movs r0, 0
movs r2, 0x4 movs r2, 0x4
bl InitBgsFromTemplates bl InitBgsFromTemplates
@@ -2119,7 +2119,7 @@ _080BC682:
lsls r0, 31 lsls r0, 31
lsrs r0, 31 lsrs r0, 31
bl sub_80BC844 bl sub_80BC844
ldr r0, =gUnknown_0855D2A8 ldr r0, =sWindowTemplates_0855D2A8
bl InitWindows bl InitWindows
bl DeactivateAllTextPrinters bl DeactivateAllTextPrinters
movs r0, 0 movs r0, 0
@@ -2141,9 +2141,9 @@ _080BC6CC:
ldr r1, =gReservedSpritePaletteCount ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8 movs r0, 0x8
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_0855D26C ldr r0, =gSpriteSheets_0855D26C
bl LoadCompressedObjectPic bl LoadCompressedObjectPic
ldr r0, =gUnknown_0855D27C ldr r0, =gSpritePalettes_0855D26C
bl LoadSpritePalettes bl LoadSpritePalettes
adds r0, r5, 0 adds r0, r5, 0
bl sub_80BDB7C bl sub_80BDB7C
@@ -2298,7 +2298,7 @@ _080BC858:
bl IsNationalPokedexEnabled bl IsNationalPokedexEnabled
cmp r0, 0 cmp r0, 0
bne _080BC870 bne _080BC870
ldr r0, =gUnknown_08DC16F6 ldr r0, =gUnknown_08DC16F4 + 2
_080BC862: _080BC862:
movs r1, 0x1 movs r1, 0x1
movs r2, 0xBE movs r2, 0xBE
@@ -2609,7 +2609,7 @@ _080BCACC:
movs r7, 0x1 movs r7, 0x1
mov r9, r7 mov r9, r7
_080BCADA: _080BCADA:
ldr r1, =gUnknown_0855C6A4 ldr r1, =gPokedexOrder_Alphabetical
lsls r4, 16 lsls r4, 16
asrs r0, r4, 15 asrs r0, r4, 15
adds r0, r1 adds r0, r1
@@ -2687,7 +2687,7 @@ _080BCB78:
ldr r7, =gUnknown_02039B4C ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c ldr r6, =0x0000060c
_080BCB82: _080BCB82:
ldr r1, =gUnknown_0855C9DA ldr r1, =gPokedexOrder_Weight
asrs r0, 15 asrs r0, 15
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
@@ -2752,7 +2752,7 @@ _080BCC08:
ldr r0, =0x00000181 ldr r0, =0x00000181
mov r9, r0 mov r9, r0
_080BCC16: _080BCC16:
ldr r1, =gUnknown_0855C9DA ldr r1, =gPokedexOrder_Weight
lsls r4, 16 lsls r4, 16
asrs r0, r4, 15 asrs r0, r4, 15
adds r0, r1 adds r0, r1
@@ -2819,7 +2819,7 @@ _080BCCA0:
ldr r7, =gUnknown_02039B4C ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c ldr r6, =0x0000060c
_080BCCAA: _080BCCAA:
ldr r1, =gUnknown_0855CCDE ldr r1, =gPokedexOrder_Height
asrs r0, 15 asrs r0, 15
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
@@ -2884,7 +2884,7 @@ _080BCD30:
ldr r0, =0x00000181 ldr r0, =0x00000181
mov r9, r0 mov r9, r0
_080BCD3E: _080BCD3E:
ldr r1, =gUnknown_0855CCDE ldr r1, =gPokedexOrder_Height
lsls r4, 16 lsls r4, 16
asrs r0, r4, 15 asrs r0, r4, 15
adds r0, r1 adds r0, r1
@@ -3517,7 +3517,7 @@ sub_80BD23C: @ 80BD23C
b _080BD266 b _080BD266
.pool .pool
_080BD264: _080BD264:
ldr r4, =gUnknown_0855D2FE ldr r4, =sText_TenDashes
_080BD266: _080BD266:
str r5, [sp] str r5, [sp]
movs r0, 0 movs r0, 0
@@ -8751,7 +8751,7 @@ _080C00E8:
ands r1, r0 ands r1, r0
cmp r1, 0 cmp r1, 0
beq _080C0114 beq _080C0114
ldr r0, =gUnknown_08DC16F6 ldr r0, =gUnknown_08DC16F4 + 2
movs r1, 0x31 movs r1, 0x31
movs r2, 0xE movs r2, 0xE
bl LoadPalette bl LoadPalette
@@ -11172,9 +11172,9 @@ _080C13F0:
b _080C1516 b _080C1516
.pool .pool
_080C1414: _080C1414:
ldr r0, =gUnknown_0855D26C ldr r0, =gSpriteSheets_0855D26C
bl LoadCompressedObjectPic bl LoadCompressedObjectPic
ldr r0, =gUnknown_0855D27C ldr r0, =gSpritePalettes_0855D26C
bl LoadSpritePalettes bl LoadSpritePalettes
adds r0, r4, 0 adds r0, r4, 0
bl sub_80C2594 bl sub_80C2594
asm/pokemon_icon.s
+9 -9
View File
@@ -28,15 +28,15 @@ sub_80D2CC4: @ 80D2CC4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r9, r0 mov r9, r0
ldr r0, =gUnknown_0857C570 ldr r0, =sMonIconOamData
str r0, [sp, 0x18] str r0, [sp, 0x18]
adds r0, r4, 0 adds r0, r4, 0
adds r2, r5, 0 adds r2, r5, 0
bl GetMonIconPtr bl GetMonIconPtr
str r0, [sp, 0x1C] str r0, [sp, 0x1C]
ldr r0, =gUnknown_0857C5B4 ldr r0, =sMonIconAnims
str r0, [sp, 0x20] str r0, [sp, 0x20]
ldr r0, =gUnknown_0857C5E8 ldr r0, =sMonIconAffineAnims
str r0, [sp, 0x24] str r0, [sp, 0x24]
str r6, [sp, 0x28] str r6, [sp, 0x28]
ldr r0, =gMonIconPaletteIndices ldr r0, =gMonIconPaletteIndices
@@ -102,13 +102,13 @@ sub_80D2D78: @ 80D2D78
lsls r6, 24 lsls r6, 24
lsrs r6, 24 lsrs r6, 24
mov r3, sp mov r3, sp
ldr r2, =gUnknown_0857C570 ldr r2, =sMonIconOamData
str r2, [sp] str r2, [sp]
movs r2, 0 movs r2, 0
str r2, [sp, 0x4] str r2, [sp, 0x4]
ldr r2, =gUnknown_0857C5B4 ldr r2, =sMonIconAnims
str r2, [sp, 0x8] str r2, [sp, 0x8]
ldr r2, =gUnknown_0857C5E8 ldr r2, =sMonIconAffineAnims
str r2, [sp, 0xC] str r2, [sp, 0xC]
str r1, [sp, 0x10] str r1, [sp, 0x10]
ldr r2, =gMonIconPaletteIndices ldr r2, =gMonIconPaletteIndices
@@ -601,7 +601,7 @@ _080D3126:
strb r7, [r5] strb r7, [r5]
b _080D31A4 b _080D31A4
_080D312A: _080D312A:
ldr r2, =gUnknown_0857C5F0 ldr r2, =sSpriteImageSizes
ldrb r1, [r4, 0x3] ldrb r1, [r4, 0x3]
lsrs r1, 6 lsrs r1, 6
lsls r1, 1 lsls r1, 1
@@ -689,7 +689,7 @@ sub_80D31B4: @ 80D31B4
mov r8, r0 mov r8, r0
movs r0, 0 movs r0, 0
str r0, [sp, 0x30] str r0, [sp, 0x30]
ldr r2, =gUnknown_0857C5F0 ldr r2, =sSpriteImageSizes
mov r0, r9 mov r0, r9
ldr r6, [r0] ldr r6, [r0]
ldrb r1, [r6, 0x3] ldrb r1, [r6, 0x3]
@@ -776,7 +776,7 @@ sub_80D328C: @ 80D328C
sub sp, 0x8 sub sp, 0x8
movs r1, 0 movs r1, 0
str r1, [sp] str r1, [sp]
ldr r3, =gUnknown_0857C5F0 ldr r3, =sSpriteImageSizes
ldrb r2, [r0, 0x3] ldrb r2, [r0, 0x3]
lsrs r2, 6 lsrs r2, 6
lsls r2, 1 lsls r2, 1
asm/pokemon_storage_system.s
+2 -2
View File
@@ -1106,7 +1106,7 @@ sub_80C7958: @ 80C7958
ldrh r0, [r3] ldrh r0, [r3]
adds r0, 0x1 adds r0, 0x1
strh r0, [r1] strh r0, [r1]
ldr r0, =gUnknown_08571710 ldr r0, =sSpriteAnimTable_8571710
str r0, [sp, 0xC] str r0, [sp, 0xC]
movs r4, 0 movs r4, 0
_080C7A10: _080C7A10:
@@ -9124,7 +9124,7 @@ _080CBF80:
adds r1, r3 adds r1, r3
ldr r0, [r1] ldr r0, [r1]
ldr r2, [r0] ldr r2, [r0]
ldr r0, =gUnknown_0857291C ldr r0, =gSpriteAffineAnimTable_857291C
str r0, [r2, 0x10] str r0, [r2, 0x10]
ldr r0, [r1] ldr r0, [r1]
ldr r0, [r0] ldr r0, [r0]
asm/rayquaza_scene.s
+3 -3
View File
@@ -1172,8 +1172,8 @@ _081D7082:
.pool .pool
thumb_func_end sub_81D706C thumb_func_end sub_81D706C
thumb_func_start task_add_00_WIN0V_open_close_above_and_more thumb_func_start sub_81D7134
task_add_00_WIN0V_open_close_above_and_more: @ 81D7134 sub_81D7134: @ 81D7134
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x8 sub sp, 0x8
lsls r0, 24 lsls r0, 24
@@ -1264,7 +1264,7 @@ _081D71EE:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end task_add_00_WIN0V_open_close_above_and_more thumb_func_end sub_81D7134
thumb_func_start sub_81D7228 thumb_func_start sub_81D7228
sub_81D7228: @ 81D7228 sub_81D7228: @ 81D7228
asm/rom6.s
+1 -1
View File
@@ -447,5 +447,5 @@ _081357EE:
bx r0 bx r0
.pool .pool
thumb_func_end sub_81357BC thumb_func_end sub_81357BC
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/rotating_gate.s
+2 -2
View File
@@ -410,7 +410,7 @@ sub_80FBAE4: @ 80FBAE4
adds r0, r4, 0x4 adds r0, r4, 0x4
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_811A138 bl GetPlayerSpeed
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
cmp r0, 0x1 cmp r0, 0x1
@@ -433,7 +433,7 @@ _080FBB2A:
adds r0, 0x8 adds r0, 0x8
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_811A138 bl GetPlayerSpeed
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
cmp r0, 0x1 cmp r0, 0x1
asm/trainer_card.s
+1 -1
View File
@@ -5766,7 +5766,7 @@ sub_80C58D4: @ 80C58D4
beq _080C5914 beq _080C5914
cmp r0, 0x2 cmp r0, 0x2
beq _080C591C beq _080C591C
bl sub_8085784 bl Overworld_PlaySpecialMapMusic
b _080C5924 b _080C5924
.pool .pool
_080C5914: _080C5914:
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/graphics.s
+229 -73
View File
@@ -20,7 +20,7 @@ gUnknown_08C01644:: @ 8C01644
gUnknown_08C01724:: @ 8C01724 gUnknown_08C01724:: @ 8C01724
.incbin "baserom.gba", 0xc01724, 0x18 .incbin "baserom.gba", 0xc01724, 0x18
.align 2 .align 2
gInterfaceGfx_PokeBall:: gInterfaceGfx_PokeBall::
.incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC
@@ -126,23 +126,23 @@ gBlankGfxCompressed:: @ 8C0237C
gUnknown_08C093F0:: @ 8C093F0 gUnknown_08C093F0:: @ 8C093F0
.incbin "baserom.gba", 0xc093f0, 0x87ac .incbin "baserom.gba", 0xc093f0, 0x87ac
.align 2 .align 2
gBattleInterface_BallStatusBarPal:: @ 8C11B9C gBattleInterface_BallStatusBarPal:: @ 8C11B9C
.incbin "graphics/battle_interface/ball_status_bar.gbapal" .incbin "graphics/battle_interface/ball_status_bar.gbapal"
.align 2 .align 2
gBattleInterface_BallDisplayPal:: @ 8C11BBC gBattleInterface_BallDisplayPal:: @ 8C11BBC
.incbin "graphics/battle_interface/ball_display.gbapal" .incbin "graphics/battle_interface/ball_display.gbapal"
.align 2 .align 2
gHealthboxElementsGfxTable:: @ 8C11BDC gHealthboxElementsGfxTable:: @ 8C11BDC
.incbin "baserom.gba", 0xc11bdc, 0x840 .incbin "baserom.gba", 0xc11bdc, 0x840
.align 2 .align 2
gBattleInterface_BallDisplayGfx:: @ 8C1241C gBattleInterface_BallDisplayGfx:: @ 8C1241C
.incbin "graphics/battle_interface/ball_display.4bpp" .incbin "graphics/battle_interface/ball_display.4bpp"
.align 2 .align 2
gUnknown_08C1249C:: @ 8C1249C gUnknown_08C1249C:: @ 8C1249C
.incbin "baserom.gba", 0xc1249c, 0x49f4 .incbin "baserom.gba", 0xc1249c, 0x49f4
@@ -268,28 +268,28 @@ gSubstituteDollGfx:: @ 8C2CEE0
gSubstituteDollTilemap:: @ 8C2D120 gSubstituteDollTilemap:: @ 8C2D120
.incbin "baserom.gba", 0xc2d120, 552 .incbin "baserom.gba", 0xc2d120, 552
gUnknown_08C2D348:: @ 8C2D348 gUnknown_08C2D348:: @ 8C2D348
.incbin "baserom.gba", 0xC2D348, 196 .incbin "baserom.gba", 0xC2D348, 196
gUnknown_08C2D40C:: @ 8C2D40C gUnknown_08C2D40C:: @ 8C2D40C
.incbin "baserom.gba", 0xC2D40C, 28 .incbin "baserom.gba", 0xC2D40C, 28
gContestConfetti_Gfx:: @ 8C2D428 gContestConfetti_Gfx:: @ 8C2D428
.incbin "baserom.gba", 0xC2D428, 288 .incbin "baserom.gba", 0xC2D428, 288
gContestConfetti_Pal:: @ 8C2D548 gContestConfetti_Pal:: @ 8C2D548
.incbin "baserom.gba", 0xC2D548, 40 .incbin "baserom.gba", 0xC2D548, 40
gUnknown_08C2D570:: @ 8C2D570 gUnknown_08C2D570:: @ 8C2D570
.incbin "baserom.gba", 0xC2D570, 316 .incbin "baserom.gba", 0xC2D570, 316
gUnknown_08C2D6AC:: @ 8C2D6AC gUnknown_08C2D6AC:: @ 8C2D6AC
.incbin "baserom.gba", 0xC2D6AC, 36 .incbin "baserom.gba", 0xC2D6AC, 36
gUnknown_08C2D6D0:: @ 8C2D6D0 gUnknown_08C2D6D0:: @ 8C2D6D0
.incbin "baserom.gba", 0xC2D6D0, 40 .incbin "baserom.gba", 0xC2D6D0, 40
gUnknown_08C2D6F8:: @ 8C2D6F8 gUnknown_08C2D6F8:: @ 8C2D6F8
.incbin "baserom.gba", 0xC2D6F8, 40 .incbin "baserom.gba", 0xC2D6F8, 40
@@ -851,10 +851,31 @@ gUnknown_08D96AB4:: @ 8D96AB4
.incbin "baserom.gba", 0xd96ab4, 0xec .incbin "baserom.gba", 0xd96ab4, 0xec
gUnknown_08D96BA0:: @ 8D96BA0 gUnknown_08D96BA0:: @ 8D96BA0
.incbin "baserom.gba", 0xd96ba0, 0xfe4 .incbin "baserom.gba", 0xd96ba0, 0x138
gUnknown_08D96CD8:: @ 8D96CD8
.incbin "baserom.gba", 0xd96cd8, 0x294
gUnknown_08D96F6C:: @ 8D96F6C
.incbin "baserom.gba", 0xd96f6c, 0x24
gUnknown_08D96F90:: @ 8D96F90
.incbin "baserom.gba", 0xd96f90, 0x1F8
gUnknown_08D97188:: @ 8D97188
.incbin "baserom.gba", 0xd97188, 0x28
gUnknown_08D971B0:: @ 8D971B0
.incbin "baserom.gba", 0xd971b0, 0x9D4
gUnknown_08D97B84:: @ 8D97B84 gUnknown_08D97B84:: @ 8D97B84
.incbin "baserom.gba", 0xd97b84, 0x188 .incbin "baserom.gba", 0xd97b84, 0x68
gUnknown_08D97BEC:: @ 8D97BEC
.incbin "baserom.gba", 0xd97bec, 0x108
gUnknown_08D97CF4:: @ 8D97CF4
.incbin "baserom.gba", 0xd97cf4, 0x18
gUnknown_08D97D0C:: @ 8D97D0C gUnknown_08D97D0C:: @ 8D97D0C
.incbin "baserom.gba", 0xd97d0c, 0x830 .incbin "baserom.gba", 0xd97d0c, 0x830
@@ -906,25 +927,25 @@ gMenuMoneyPal:: @ 8D9B0C8
gBuyMenuFrame_Tilemap:: @ 8D9B0F0 gBuyMenuFrame_Tilemap:: @ 8D9B0F0
.incbin "baserom.gba", 0xd9b0f0, 0x140 .incbin "baserom.gba", 0xd9b0f0, 0x140
gMenuMoneyGfx:: @ 8D9B230 gMenuMoneyGfx:: @ 8D9B230
.incbin "baserom.gba", 0xd9b230, 0x84 .incbin "baserom.gba", 0xd9b230, 0x84
gMenuPokeblock_Gfx:: @ 8D9B2B4 gMenuPokeblock_Gfx:: @ 8D9B2B4
.incbin "baserom.gba", 0xd9b2b4, 0x1bc .incbin "baserom.gba", 0xd9b2b4, 0x1bc
gMenuPokeblock_Pal:: @ 8D9B470 gMenuPokeblock_Pal:: @ 8D9B470
.incbin "baserom.gba", 0xd9b470, 0x70 .incbin "baserom.gba", 0xd9b470, 0x70
gMenuPokeblockDevice_Gfx:: @ 8D9B4E0 gMenuPokeblockDevice_Gfx:: @ 8D9B4E0
.incbin "baserom.gba", 0xd9b4e0, 0x2c0 .incbin "baserom.gba", 0xd9b4e0, 0x2c0
gMenuPokeblockDevice_Pal:: @ 8D9B7A0 gMenuPokeblockDevice_Pal:: @ 8D9B7A0
.incbin "baserom.gba", 0xd9b7a0, 0x28 .incbin "baserom.gba", 0xd9b7a0, 0x28
gMenuPokeblock_Tilemap:: @ 8D9B7C8 gMenuPokeblock_Tilemap:: @ 8D9B7C8
.incbin "baserom.gba", 0xd9b7c8, 0x148 .incbin "baserom.gba", 0xd9b7c8, 0x148
.align 2 .align 2
gPokeblock_Gfx:: gPokeblock_Gfx::
.incbin "graphics/pokeblock/pokeblock.4bpp.lz" .incbin "graphics/pokeblock/pokeblock.4bpp.lz"
@@ -1003,8 +1024,29 @@ gUnknown_08D9C13C:: @ 8D9C13C
@ 8D9C3A8 @ 8D9C3A8
.include "data/graphics/berries/berry_graphics.inc" .include "data/graphics/berries/berry_graphics.inc"
@ 8DA1E78 gUnknown_08DA1E78:: @ 8DA1E78
.incbin "baserom.gba", 0xda1e78, 0x1548 .incbin "baserom.gba", 0xda1e78, 0xBE4
gUnknown_08DA2A5C:: @ 8DA2A5C
.incbin "baserom.gba", 0xDA2A5C, 0xCC
gUnknown_08DA2B28:: @ 8DA2B28
.incbin "baserom.gba", 0xDA2B28, 0x1F4
gUnknown_08DA2D1C:: @ 8DA2D1C
.incbin "baserom.gba", 0xDA2D1C, 0x534
gUnknown_08DA3250:: @ 8DA3250
.incbin "baserom.gba", 0xDA3250, 0x54
gUnknown_08DA32A4:: @ 8DA32A4
.incbin "baserom.gba", 0xDA32A4, 0xCC
gUnknown_08DA3370:: @ 8DA3370
.incbin "baserom.gba", 0xDA3370, 0x28
gUnknown_08DA3398:: @ 8DA3398
.incbin "baserom.gba", 0xDA3398, 0x28
gUnknown_08DA33C0:: @ 8DA33C0 gUnknown_08DA33C0:: @ 8DA33C0
.incbin "baserom.gba", 0xda33c0, 0x428 .incbin "baserom.gba", 0xda33c0, 0x428
@@ -1019,7 +1061,13 @@ gUnknown_08DA3988:: @ 8DA3988
.incbin "baserom.gba", 0xda3988, 0x100 .incbin "baserom.gba", 0xda3988, 0x100
gUnknown_08DA3A88:: @ 8DA3A88 gUnknown_08DA3A88:: @ 8DA3A88
.incbin "baserom.gba", 0xda3a88, 0x20c .incbin "baserom.gba", 0xda3a88, 0x138
gUnknown_08DA3BC0:: @ 8DA3BC0
.incbin "baserom.gba", 0xDA3BC0, 0xBC
gUnknown_08DA3C7C:: @ 8DA3C7C
.incbin "baserom.gba", 0xDA3C7C, 0x18
gUnknown_08DA3C94:: @ 8DA3C94 gUnknown_08DA3C94:: @ 8DA3C94
.incbin "baserom.gba", 0xda3c94, 0x1114 .incbin "baserom.gba", 0xda3c94, 0x1114
@@ -1034,7 +1082,13 @@ gUnknown_08DA4F70:: @ 8DA4F70
.incbin "baserom.gba", 0xda4f70, 0x1148 .incbin "baserom.gba", 0xda4f70, 0x1148
gUnknown_08DA60B8:: @ 8DA60B8 gUnknown_08DA60B8:: @ 8DA60B8
.incbin "baserom.gba", 0xda60b8, 0x904 .incbin "baserom.gba", 0xda60b8, 0x388
gUnknown_08DA6440:: @ 8DA6440
.incbin "baserom.gba", 0xDA6440, 0x46C
gUnknown_08DA68AC:: @ 8DA68AC
.incbin "baserom.gba", 0xDA68AC, 0x110
gUnknown_08DA69BC:: @ 8DA69BC gUnknown_08DA69BC:: @ 8DA69BC
.incbin "baserom.gba", 0xda69bc, 0xb6c .incbin "baserom.gba", 0xda69bc, 0xb6c
@@ -1073,7 +1127,37 @@ gUnknown_08DA8D6C:: @ 8DA8D6C
.incbin "baserom.gba", 0xda8d6c, 0x118 .incbin "baserom.gba", 0xda8d6c, 0x118
gUnknown_08DA8E84:: @ 8DA8E84 gUnknown_08DA8E84:: @ 8DA8E84
.incbin "baserom.gba", 0xda8e84, 0x1a30 .incbin "baserom.gba", 0xda8e84, 0x54
gUnknown_08DA8ED8:: @ 8DA8ED8
.incbin "baserom.gba", 0xDA8ED8, 0x798
gUnknown_08DA9670:: @ 8DA9670
.incbin "baserom.gba", 0xDA9670, 0x44
gUnknown_08DA96B4:: @ 8DA96B4
.incbin "baserom.gba", 0xDA96B4, 0x248
gUnknown_08DA98FC:: @ 8DA98FC
.incbin "baserom.gba", 0xDA98FC, 0xCA8
gUnknown_08DAA5A4:: @ 8DAA5A4
.incbin "baserom.gba", 0xDAA5A4, 0x1F0
gUnknown_08DAA794:: @ 8DAA794
.incbin "baserom.gba", 0xDAA794, 0x98
gUnknown_08DAA82C:: @ 8DAA82C
.incbin "baserom.gba", 0xDAA82C, 0x28
gUnknown_08DAA854:: @ 8DAA854
.incbin "baserom.gba", 0xDAA854, 0x28
gUnknown_08DAA87C:: @ 8DAA87C
.incbin "baserom.gba", 0xDAA87C, 0x28
gUnknown_08DAA8A4:: @ 8DAA8A4
.incbin "baserom.gba", 0xDAA8A4, 0x10
gUnknown_08DAA8B4:: @ 8DAA8B4 gUnknown_08DAA8B4:: @ 8DAA8B4
.incbin "baserom.gba", 0xdaa8b4, 0x270 .incbin "baserom.gba", 0xdaa8b4, 0x270
@@ -1100,7 +1184,7 @@ gUnknown_08DAAFEC:: @ 8DAAFEC
.include "data/graphics/decorations/decoration_graphics.inc" .include "data/graphics/decorations/decoration_graphics.inc"
@ 8DBA14C @ 8DBA14C
.incbin "baserom.gba", 0xdba14c, 0x3cc .incbin "baserom.gba", 0xdba14c, 0x3cc
gUnknown_08DBA518:: @ 8DBA518 gUnknown_08DBA518:: @ 8DBA518
.incbin "baserom.gba", 0xdba518, 0x80 .incbin "baserom.gba", 0xdba518, 0x80
@@ -1268,10 +1352,25 @@ gUnknown_08DC0754:: @ 8DC0754
.incbin "baserom.gba", 0xdc0754, 0x440 .incbin "baserom.gba", 0xdc0754, 0x440
gUnknown_08DC0B94:: @ 8DC0B94 gUnknown_08DC0B94:: @ 8DC0B94
.incbin "baserom.gba", 0xdc0b94, 0xb62 .incbin "baserom.gba", 0xdc0b94, 0x800
gUnknown_08DC16F6:: @ 8DC16F6 gUnknown_08DC1394:: @ 8DC1394
.incbin "baserom.gba", 0xdc16f6, 0x60 .incbin "baserom.gba", 0xdc1394, 0x2E0
gUnknown_08DC1674:: @ 8DC1674
.incbin "baserom.gba", 0xdc1674, 0x20
gUnknown_08DC1694:: @ 8DC1694
.incbin "baserom.gba", 0xdc1694, 0x20
gUnknown_08DC16B4:: @ 8DC16B4
.incbin "baserom.gba", 0xdc16b4, 0x20
gUnknown_08DC16D4:: @ 8DC16D4
.incbin "baserom.gba", 0xdc16d4, 0x20
gUnknown_08DC16F4:: @ 8DC16F4
.incbin "baserom.gba", 0xdc16f4, 0x62
gUnknown_08DC1756:: @ 8DC1756 gUnknown_08DC1756:: @ 8DC1756
.incbin "baserom.gba", 0xdc1756, 0x60 .incbin "baserom.gba", 0xdc1756, 0x60
@@ -1283,7 +1382,10 @@ gUnknown_08DC1876:: @ 8DC1876
.incbin "baserom.gba", 0xdc1876, 0xbe .incbin "baserom.gba", 0xdc1876, 0xbe
gUnknown_08DC1934:: @ 8DC1934 gUnknown_08DC1934:: @ 8DC1934
.incbin "baserom.gba", 0xdc1934, 0x10d4 .incbin "baserom.gba", 0xdc1934, 0xA18
gUnknown_08DC234C:: @ 8DC234C
.incbin "baserom.gba", 0xDC234C, 0x6BC
gUnknown_08DC2A08:: @ 8DC2A08 gUnknown_08DC2A08:: @ 8DC2A08
.incbin "baserom.gba", 0xdc2a08, 0x114 .incbin "baserom.gba", 0xdc2a08, 0x114
@@ -1416,7 +1518,43 @@ gUnknown_08DC7D84:: @ 8DC7D84
.incbin "baserom.gba", 0xdc7d84, 0x17c .incbin "baserom.gba", 0xdc7d84, 0x17c
gUnknown_08DC7F00:: @ 8DC7F00 gUnknown_08DC7F00:: @ 8DC7F00
.incbin "baserom.gba", 0xdc7f00, 0x11c0 .incbin "baserom.gba", 0xdc7f00, 0xA0
gUnknown_08DC7FA0:: @ 8DC7FA0
.incbin "baserom.gba", 0xdc7fa0, 0x13C
gUnknown_08DC80DC:: @ 8DC80DC
.incbin "baserom.gba", 0xdc80dc, 0x12C
gUnknown_08DC8208:: @ 8DC8208
.incbin "baserom.gba", 0xdc8208, 0x184
gUnknown_08DC838C:: @ 8DC838C
.incbin "baserom.gba", 0xdc838c, 0x120
gUnknown_08DC84AC:: @ 8DC84AC
.incbin "baserom.gba", 0xdc84ac, 0x1A0
gUnknown_08DC864C:: @ 8DC864C
.incbin "baserom.gba", 0xdc864c, 0x1AC
gUnknown_08DC87F8:: @ 8DC87F8
.incbin "baserom.gba", 0xdc87f8, 0x2AC
gUnknown_08DC8AA4:: @ 8DC8AA4
.incbin "baserom.gba", 0xdc8aa4, 0x170
gUnknown_08DC8C14:: @ 8DC8C14
.incbin "baserom.gba", 0xdc8c14, 0x13C
gUnknown_08DC8D50:: @ 8DC8D50
.incbin "baserom.gba", 0xdc8d50, 0x114
gUnknown_08DC8E64:: @ 8DC8E64
.incbin "baserom.gba", 0xdc8e64, 0x100
gUnknown_08DC8F64:: @ 8DC8F64
.incbin "baserom.gba", 0xdc8f64, 0x15C
gUnknown_08DC90C0:: @ 8DC90C0 gUnknown_08DC90C0:: @ 8DC90C0
.incbin "baserom.gba", 0xdc90c0, 0x20 .incbin "baserom.gba", 0xdc90c0, 0x20
@@ -1428,50 +1566,53 @@ gUnknown_08DC9130:: @ 8DC9130
.incbin "baserom.gba", 0xdc9130, 0xb8 .incbin "baserom.gba", 0xdc9130, 0xb8
gUnknown_08DC91E8:: @ 8DC91E8 gUnknown_08DC91E8:: @ 8DC91E8
.incbin "baserom.gba", 0xdc91e8, 0x420 .incbin "baserom.gba", 0xdc91e8, 0x20
gUnknown_08DC9208:: @ 8DC9208
.incbin "baserom.gba", 0xdc9208, 0x400
gUnknown_08DC9608:: @ 8DC9608 gUnknown_08DC9608:: @ 8DC9608
.incbin "baserom.gba", 0xdc9608, 0x20 .incbin "baserom.gba", 0xdc9608, 0x20
gUnknown_08DC9628:: @ 8DC9628 gUnknown_08DC9628:: @ 8DC9628
.incbin "baserom.gba", 0xdc9628, 0x320 .incbin "baserom.gba", 0xdc9628, 0x320
gBerryBlenderMiscPalette:: @ 8DCAB88 gBerryBlenderMiscPalette:: @ 8DCAB88
.incbin "graphics/berry_blender/misc.gbapal" .incbin "graphics/berry_blender/misc.gbapal"
gBerryBlenderArrowPalette:: @ 8DC9948 gBerryBlenderArrowPalette:: @ 8DC9948
.incbin "graphics/berry_blender/arrow.gbapal" .incbin "graphics/berry_blender/arrow.gbapal"
gUnknown_8DC9988:: @ 8DC9988 gUnknown_8DC9988:: @ 8DC9988
.incbin "baserom.gba", 0xdc9988, 0x200 .incbin "baserom.gba", 0xdc9988, 0x200
.align 2 .align 2
gBerryBlenderMarubatsuTiles:: @ 8DC9B88 gBerryBlenderMarubatsuTiles:: @ 8DC9B88
.incbin "graphics/berry_blender/marubatsu.4bpp" .incbin "graphics/berry_blender/marubatsu.4bpp"
.align 2 .align 2
gBerryBlenderParticlesTiles:: @ 8E90818 gBerryBlenderParticlesTiles:: @ 8E90818
.incbin "graphics/berry_blender/particles.4bpp" .incbin "graphics/berry_blender/particles.4bpp"
.space 0x120 .space 0x120
.align 2 .align 2
gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88 gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88
.incbin "graphics/berry_blender/countdown_numbers.4bpp" .incbin "graphics/berry_blender/countdown_numbers.4bpp"
.align 2 .align 2
gBerryBlenderStartTiles:: @ 8DCA588 gBerryBlenderStartTiles:: @ 8DCA588
.incbin "graphics/berry_blender/start.4bpp" .incbin "graphics/berry_blender/start.4bpp"
.space 0x200 .space 0x200
.align 2 .align 2
gBerryBlenderArrowTiles:: @ 8DCAB88 gBerryBlenderArrowTiles:: @ 8DCAB88
.incbin "graphics/berry_blender/arrow.4bpp" .incbin "graphics/berry_blender/arrow.4bpp"
gUnknown_08DCB388:: @ 8DCB388 gUnknown_08DCB388:: @ 8DCB388
.incbin "baserom.gba", 0xdcb388, 0xA28 .incbin "baserom.gba", 0xdcb388, 0xA28
gUnknown_08DCBDB0:: @ 8DCBDB0 gUnknown_08DCBDB0:: @ 8DCBDB0
.incbin "baserom.gba", 0xdcbdb0, 0x20 .incbin "baserom.gba", 0xdcbdb0, 0x20
@@ -1494,10 +1635,19 @@ gUnknown_08DCC648:: @ 8DCC648
.incbin "baserom.gba", 0xdcc648, 0x2c0 .incbin "baserom.gba", 0xdcc648, 0x2c0
gUnknown_08DCC908:: @ 8DCC908 gUnknown_08DCC908:: @ 8DCC908
.incbin "baserom.gba", 0xdcc908, 0x2b0 .incbin "baserom.gba", 0xdcc908, 0x290
gUnknown_08DCCB98:: @ 8DCCB98
.incbin "baserom.gba", 0xdccb98, 0x20
gUnknown_08DCCBB8:: @ 8DCCBB8 gUnknown_08DCCBB8:: @ 8DCCBB8
.incbin "baserom.gba", 0xdccbb8, 0x3a4 .incbin "baserom.gba", 0xdccbb8, 0x184
gUnknown_08DCCD3C:: @ 8DCCD3C
.incbin "baserom.gba", 0xdccd3c, 0x20
gUnknown_08DCCD5C:: @ 8DCCD5C
.incbin "baserom.gba", 0xdccd5c, 0x200
gUnknown_08DCCF5C:: @ 8DCCF5C gUnknown_08DCCF5C:: @ 8DCCF5C
.incbin "baserom.gba", 0xdccf5c, 0x20 .incbin "baserom.gba", 0xdccf5c, 0x20
@@ -1524,22 +1674,28 @@ gUnknown_08DCEC70:: @ 8DCEC70
.incbin "baserom.gba", 0xdcec70, 0x13e0 .incbin "baserom.gba", 0xdcec70, 0x13e0
gUnknown_08DD0050:: @ 8DD0050 gUnknown_08DD0050:: @ 8DD0050
.incbin "baserom.gba", 0xdd0050, 0x1a68 .incbin "baserom.gba", 0xdd0050, 0x1A08
gUnknown_08DD1A58:: @ 8DD1A58
.incbin "baserom.gba", 0xdd1a58, 0x60
gUnknown_08DD1AB8:: @ 8DD1AB8 gUnknown_08DD1AB8:: @ 8DD1AB8
.incbin "baserom.gba", 0xdd1ab8, 0x4c0 .incbin "baserom.gba", 0xdd1ab8, 0x4C0
gUnknown_08DD1F78:: @ 8DD1F78 gUnknown_08DD1F78:: @ 8DD1F78
.incbin "baserom.gba", 0xdd1f78, 0x98 .incbin "baserom.gba", 0xdd1f78, 0x98
gUnknown_08DD2010:: @ 8DD2010 gUnknown_08DD2010:: @ 8DD2010
.incbin "baserom.gba", 0xdd2010, 0x1a0 .incbin "baserom.gba", 0xdd2010, 0x1A0
gUnknown_08DD21B0:: @ 8DD21B0 gUnknown_08DD21B0:: @ 8DD21B0
.incbin "baserom.gba", 0xdd21b0, 0xdc .incbin "baserom.gba", 0xdd21b0, 0xDC
gUnknown_08DD228C:: @ 8DD228C gUnknown_08DD228C:: @ 8DD228C
.incbin "baserom.gba", 0xdd228c, 0x1e0 .incbin "baserom.gba", 0xdd228c, 0x180
gUnknown_08DD240C:: @ 8DD240C
.incbin "baserom.gba", 0xdd240c, 0x60
gUnknown_08DD246C:: @ 8DD246C gUnknown_08DD246C:: @ 8DD246C
.incbin "baserom.gba", 0xdd246c, 0x674 .incbin "baserom.gba", 0xdd246c, 0x674
@@ -1582,7 +1738,7 @@ gUnknown_08DD46E0:: @ 8DD46E0
gUnknown_08DD47A0:: @ 8DD47A0 gUnknown_08DD47A0:: @ 8DD47A0
.incbin "baserom.gba", 0xdd47a0, 0xc0 .incbin "baserom.gba", 0xdd47a0, 0xc0
gUnknown_08DD4860:: @ 8DD4860 gUnknown_08DD4860:: @ 8DD4860
.incbin "baserom.gba", 0xdd4860, 0x20 .incbin "baserom.gba", 0xdd4860, 0x20
@@ -1604,7 +1760,7 @@ gUnknown_08DD4BF0:: @ 8DD4BF0
gUnknown_08DD4C4C:: @ 8DD4C4C gUnknown_08DD4C4C:: @ 8DD4C4C
.incbin "baserom.gba", 0xdd4c4c, 0xac .incbin "baserom.gba", 0xdd4c4c, 0xac
.align 2 .align 2
gUnknown_08DD4CF8:: @ 8DD4CF8 gUnknown_08DD4CF8:: @ 8DD4CF8
.incbin "graphics/interface/unk_change_case.4bpp.lz" .incbin "graphics/interface/unk_change_case.4bpp.lz"
@@ -1638,61 +1794,61 @@ gUnknown_08DD7300:: @ 8DD7300
.incbin "baserom.gba", 0xdd7300, 0x60 .incbin "baserom.gba", 0xdd7300, 0x60
gUnknown_08DD7360:: @ 8DD7360 gUnknown_08DD7360:: @ 8DD7360
.incbin "baserom.gba", 0xdd7360, 0x1420 .incbin "baserom.gba", 0xdd7360, 0x1420
gUnknown_08DD8780:: @ 8DD8780 gUnknown_08DD8780:: @ 8DD8780
.incbin "baserom.gba", 0xdd8780, 0x40 .incbin "baserom.gba", 0xdd8780, 0x40
gUnknown_08DD87C0:: @ 8DD87C0 gUnknown_08DD87C0:: @ 8DD87C0
.incbin "baserom.gba", 0xdd87c0, 0x720 .incbin "baserom.gba", 0xdd87c0, 0x720
gUnknown_08DD8EE0:: @ 8DD8EE0 gUnknown_08DD8EE0:: @ 8DD8EE0
.incbin "baserom.gba", 0xdd8ee0, 0x1a0 .incbin "baserom.gba", 0xdd8ee0, 0x1a0
gUnknown_08DD9080:: @ 8DD9080 gUnknown_08DD9080:: @ 8DD9080
.incbin "baserom.gba", 0xdd9080, 0x60 .incbin "baserom.gba", 0xdd9080, 0x60
gUnknown_08DD90E0:: @ 8DD90E0 gUnknown_08DD90E0:: @ 8DD90E0
.incbin "baserom.gba", 0xdd90e0, 0x638 .incbin "baserom.gba", 0xdd90e0, 0x638
gUnknown_08DD9718:: @ 8DD9718 gUnknown_08DD9718:: @ 8DD9718
.incbin "baserom.gba", 0xdd9718, 0x15c .incbin "baserom.gba", 0xdd9718, 0x15c
gUnknown_08DD9874:: @ 8DD9874 gUnknown_08DD9874:: @ 8DD9874
.incbin "baserom.gba", 0xdd9874, 0x40 .incbin "baserom.gba", 0xdd9874, 0x40
gUnknown_08DD98B4:: @ 8DD98B4 gUnknown_08DD98B4:: @ 8DD98B4
.incbin "baserom.gba", 0xdd98b4, 0x5a4 .incbin "baserom.gba", 0xdd98b4, 0x5a4
gUnknown_08DD9E58:: @ 8DD9E58 gUnknown_08DD9E58:: @ 8DD9E58
.incbin "baserom.gba", 0xdd9e58, 0x194 .incbin "baserom.gba", 0xdd9e58, 0x194
gUnknown_08DD9FEC:: @ 8DD9FEC gUnknown_08DD9FEC:: @ 8DD9FEC
.incbin "baserom.gba", 0xdd9fec, 0x40 .incbin "baserom.gba", 0xdd9fec, 0x40
gUnknown_08DDA02C:: @ 8DDA02C gUnknown_08DDA02C:: @ 8DDA02C
.incbin "baserom.gba", 0xdda02c, 0x610 .incbin "baserom.gba", 0xdda02c, 0x610
gUnknown_08DDA63C:: @ 8DDA63C gUnknown_08DDA63C:: @ 8DDA63C
.incbin "baserom.gba", 0xdda63c, 0x1c4 .incbin "baserom.gba", 0xdda63c, 0x1c4
gUnknown_08DDA800:: @ 8DDA800 gUnknown_08DDA800:: @ 8DDA800
.incbin "baserom.gba", 0xdda800, 0x40 .incbin "baserom.gba", 0xdda800, 0x40
gUnknown_08DDA840:: @ 8DDA840 gUnknown_08DDA840:: @ 8DDA840
.incbin "baserom.gba", 0xdda840, 0x600 .incbin "baserom.gba", 0xdda840, 0x600
gUnknown_08DDAE40:: @ 8DDAE40 gUnknown_08DDAE40:: @ 8DDAE40
.incbin "baserom.gba", 0xddae40, 0x1a0 .incbin "baserom.gba", 0xddae40, 0x1a0
gUnknown_08DDAFE0:: @ 8DDAFE0 gUnknown_08DDAFE0:: @ 8DDAFE0
.incbin "baserom.gba", 0xddafe0, 0x40 .incbin "baserom.gba", 0xddafe0, 0x40
gUnknown_08DDB020:: @ 8DDB020 gUnknown_08DDB020:: @ 8DDB020
.incbin "baserom.gba", 0xddb020, 0x2a4 .incbin "baserom.gba", 0xddb020, 0x2a4
gUnknown_08DDB2C4:: @ 8DDB2C4 gUnknown_08DDB2C4:: @ 8DDB2C4
.incbin "baserom.gba", 0xddb2c4, 0x120 .incbin "baserom.gba", 0xddb2c4, 0x120
gUnknown_08DDB3E4:: @ 8DDB3E4 gUnknown_08DDB3E4:: @ 8DDB3E4
.incbin "baserom.gba", 0xddb3e4, 0x80 .incbin "baserom.gba", 0xddb3e4, 0x80
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/party_menu.s
+56 -9
View File
@@ -166,10 +166,51 @@ gUnknown_08615AF1:: @ 8615AF1
.incbin "baserom.gba", 0x615af1, 0x3 .incbin "baserom.gba", 0x615af1, 0x3
gUnknown_08615AF4:: @ 8615AF4 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 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 gUnknown_08615C08:: @ 8615C08
.incbin "baserom.gba", 0x615c08, 0x130 .incbin "baserom.gba", 0x615c08, 0x130
@@ -187,22 +228,28 @@ gUnknown_08615D9C:: @ 8615D9C
.incbin "baserom.gba", 0x615d9c, 0x70 .incbin "baserom.gba", 0x615d9c, 0x70
gUnknown_08615E0C:: @ 8615E0C 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 gUnknown_08615EB0:: @ 8615EB0
.incbin "baserom.gba", 0x615eb0, 0x8 obj_tiles gUnknown_08615E30, 0x40, 55120
gUnknown_08615EB8:: @ 8615EB8 gUnknown_08615EB8:: @ 8615EB8
.incbin "baserom.gba", 0x615eb8, 0x8 obj_pal gUnknown_08615E70, 55120
gUnknown_08615EC0:: @ 8615EC0 gUnknown_08615EC0:: @ 8615EC0
.incbin "baserom.gba", 0x615ec0, 0x38 .incbin "baserom.gba", 0x615ec0, 0x38
gUnknown_08615EF8:: @ 8615EF8 gUnknown_08615EF8:: @ 8615EF8
.incbin "baserom.gba", 0x615ef8, 0x8 obj_tiles gUnknown_08D96CD8, 0x400, 1200
gUnknown_08615F00:: @ 8615F00 gUnknown_08615F00:: @ 8615F00
.incbin "baserom.gba", 0x615f00, 0x8 obj_pal gUnknown_08D96F6C, 1200
gUnknown_08615F08:: @ 8615F08 gUnknown_08615F08:: @ 8615F08
.incbin "baserom.gba", 0x615f08, 0x68 .incbin "baserom.gba", 0x615f08, 0x68
@@ -214,10 +261,10 @@ gUnknown_08615F78:: @ 8615F78
.incbin "baserom.gba", 0x615f78, 0x80 .incbin "baserom.gba", 0x615f78, 0x80
gUnknown_08615FF8:: @ 8615FF8 gUnknown_08615FF8:: @ 8615FF8
.incbin "baserom.gba", 0x615ff8, 0x8 obj_tiles gUnknown_08D96F90, 0x400, 1202
gUnknown_08616000:: @ 8616000 gUnknown_08616000:: @ 8616000
.incbin "baserom.gba", 0x616000, 0x8 obj_pal gUnknown_08D97188, 1202
gUnknown_08616008:: @ 8616008 gUnknown_08616008:: @ 8616008
.incbin "baserom.gba", 0x616008, 0x18 .incbin "baserom.gba", 0x616008, 0x18
data/pokedex.s
+144 -65
View File
@@ -1,62 +1,26 @@
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_0855C6A4:: @ 855C6A4 .macro unk_dex_struct texts, a2, a3, a4
.incbin "baserom.gba", 0x55c6a4, 0x336 .4byte \texts
.byte \a2, \a3, \a4
.byte 0 @padding
.endm
gUnknown_0855C9DA:: @ 855C9DA .macro unk_dex_struct_2 text, a2, a3, a4, a5, a6, a7
.incbin "baserom.gba", 0x55c9da, 0x304 .4byte \text
.byte \a2, \a3, \a4, \a5, \a6, \a7
.2byte 0 @padding
.endm
gUnknown_0855CCDE:: @ 855CCDE .macro unk_dex_struct_3 text, a2, a3, a4
.incbin "baserom.gba", 0x55ccde, 0x4b6 .4byte \text
.byte \a2, \a3, \a4
gUnknown_0855D194:: @ 855D194 .byte 0 @padding
.incbin "baserom.gba", 0x55d194, 0x18 .endm
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
gUnknown_0855D2B8:: @ 855D2B8 gUnknown_0855D2B8:: @ 855D2B8
.incbin "baserom.gba", 0x55d2b8, 0x6 .incbin "baserom.gba", 0x55d2b8, 0x6
@@ -64,8 +28,10 @@ gUnknown_0855D2B8:: @ 855D2B8
gUnknown_0855D2BE:: @ 855D2BE gUnknown_0855D2BE:: @ 855D2BE
.incbin "baserom.gba", 0x55d2be, 0x40 .incbin "baserom.gba", 0x55d2be, 0x40
gUnknown_0855D2FE:: @ 855D2FE sText_TenDashes:: @ 855D2FE
.incbin "baserom.gba", 0x55d2fe, 0xe .string "----------$"
.align 2
gUnknown_0855D30C:: @ 855D30C gUnknown_0855D30C:: @ 855D30C
.string "$" .string "$"
@@ -101,10 +67,18 @@ gUnknown_0856ED08:: @ 856ED08
.incbin "baserom.gba", 0x56ed08, 0x28 .incbin "baserom.gba", 0x56ed08, 0x28
gUnknown_0856ED30:: @ 856ED30 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 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 gUnknown_0856ED9C:: @ 856ED9C
.incbin "baserom.gba", 0x56ed9c, 0x1c .incbin "baserom.gba", 0x56ed9c, 0x1c
@@ -119,19 +93,119 @@ gUnknown_0856EDF0:: @ 856EDF0
.incbin "baserom.gba", 0x56edf0, 0x1c .incbin "baserom.gba", 0x56edf0, 0x1c
gUnknown_0856EE0C:: @ 856EE0C 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 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 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 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 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 gUnknown_0856EFAC:: @ 856EFAC
.incbin "baserom.gba", 0x56efac, 0x2 .incbin "baserom.gba", 0x56efac, 0x2
@@ -143,7 +217,12 @@ gUnknown_0856EFB4:: @ 856EFB4
.incbin "baserom.gba", 0x56efb4, 0x14 .incbin "baserom.gba", 0x56efb4, 0x14
gUnknown_0856EFC8:: @ 856EFC8 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 gUnknown_0856EFF8:: @ 856EFF8
.incbin "baserom.gba", 0x56eff8, 0x10 .incbin "baserom.gba", 0x56eff8, 0x10
data/pokedex_entries.inc
+230 -230
View File
@@ -1,11 +1,11 @@
.align 2 .align 2
gPokedexEntries:: @ 856B5B0 gPokedexEntries:: @ 856B5B0
.string "UNKNOWN$", 12 .string "UNKNOWN$", 12
pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0 pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0
.string "SEED$", 12 .string "SEED$", 12
pokedex_entry 7, 69, gBulbasaurPokedexText, 356, 17, 256, 0 pokedex_entry 7, 69, gBulbasaurPokedexText, 356, 17, 256, 0
.string "SEED$", 12 .string "SEED$", 12
pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0 pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0
.string "SEED$", 12 .string "SEED$", 12
pokedex_entry 20, 1000, gVenusaurPokedexText, 256, 0, 388, 6 pokedex_entry 20, 1000, gVenusaurPokedexText, 256, 0, 388, 6
.string "LIZARD$", 12 .string "LIZARD$", 12
@@ -23,37 +23,37 @@ gPokedexEntries:: @ 856B5B0
.string "WORM$", 12 .string "WORM$", 12
pokedex_entry 3, 29, gCaterpiePokedexText, 549, 22, 256, 0 pokedex_entry 3, 29, gCaterpiePokedexText, 549, 22, 256, 0
.string "COCOON$", 12 .string "COCOON$", 12
pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0 pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0
.string "BUTTERFLY$", 12 .string "BUTTERFLY$", 12
pokedex_entry 11, 320, gButterfreePokedexText, 312, 2, 256, 0 pokedex_entry 11, 320, gButterfreePokedexText, 312, 2, 256, 0
.string "HAIRY BUG$", 12 .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 .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 .string "POISON BEE$", 12
pokedex_entry 10, 295, gBeedrillPokedexText, 366, 2, 256, 0 pokedex_entry 10, 295, gBeedrillPokedexText, 366, 2, 256, 0
.string "TINY BIRD$", 12 .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 .string "BIRD$", 12
pokedex_entry 11, 300, gPidgeottoPokedexText, 331, 10, 256, 0 pokedex_entry 11, 300, gPidgeottoPokedexText, 331, 10, 256, 0
.string "BIRD$", 12 .string "BIRD$", 12
pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0 pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0
.string "MOUSE$", 12 .string "MOUSE$", 12
pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0 pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0
.string "MOUSE$", 12 .string "MOUSE$", 12
pokedex_entry 7, 185, gRaticatePokedexText, 459, 18, 256, 0 pokedex_entry 7, 185, gRaticatePokedexText, 459, 18, 256, 0
.string "TINY BIRD$", 12 .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 .string "BEAK$", 12
pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0 pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0
.string "SNAKE$", 12 .string "SNAKE$", 12
pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0 pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0
.string "COBRA$", 12 .string "COBRA$", 12
pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2 pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2
.string "MOUSE$", 12 .string "MOUSE$", 12
pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0 pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0
.string "MOUSE$", 12 .string "MOUSE$", 12
pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0 pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0
.string "MOUSE$", 12 .string "MOUSE$", 12
pokedex_entry 6, 120, gSandshrewPokedexText, 365, 18, 256, 0 pokedex_entry 6, 120, gSandshrewPokedexText, 365, 18, 256, 0
.string "MOUSE$", 12 .string "MOUSE$", 12
@@ -75,7 +75,7 @@ gPokedexEntries:: @ 856B5B0
.string "FAIRY$", 12 .string "FAIRY$", 12
pokedex_entry 13, 400, gClefablePokedexText, 256, 5, 256, 0 pokedex_entry 13, 400, gClefablePokedexText, 256, 5, 256, 0
.string "FOX$", 12 .string "FOX$", 12
pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0 pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0
.string "FOX$", 12 .string "FOX$", 12
pokedex_entry 11, 199, gNinetalesPokedexText, 339, 10, 256, 0 pokedex_entry 11, 199, gNinetalesPokedexText, 339, 10, 256, 0
.string "BALLOON$", 12 .string "BALLOON$", 12
@@ -83,37 +83,37 @@ gPokedexEntries:: @ 856B5B0
.string "BALLOON$", 12 .string "BALLOON$", 12
pokedex_entry 10, 120, gWigglytuffPokedexText, 328, 11, 256, 0 pokedex_entry 10, 120, gWigglytuffPokedexText, 328, 11, 256, 0
.string "BAT$", 12 .string "BAT$", 12
pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0 pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0
.string "BAT$", 12 .string "BAT$", 12
pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0 pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0
.string "WEED$", 12 .string "WEED$", 12
pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0 pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0
.string "WEED$", 12 .string "WEED$", 12
pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0 pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0
.string "FLOWER$", 12 .string "FLOWER$", 12
pokedex_entry 12, 186, gVileplumePokedexText, 256, 4, 256, 0 pokedex_entry 12, 186, gVileplumePokedexText, 256, 4, 256, 0
.string "MUSHROOM$", 12 .string "MUSHROOM$", 12
pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0 pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0
.string "MUSHROOM$", 12 .string "MUSHROOM$", 12
pokedex_entry 10, 295, gParasectPokedexText, 307, 8, 256, 0 pokedex_entry 10, 295, gParasectPokedexText, 307, 8, 256, 0
.string "INSECT$", 12 .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 .string "POISON MOTH$", 12
pokedex_entry 15, 125, gVenomothPokedexText, 285, 2, 256, 1 pokedex_entry 15, 125, gVenomothPokedexText, 285, 2, 256, 1
.string "MOLE$", 12 .string "MOLE$", 12
pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0 pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0
.string "MOLE$", 12 .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 .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 .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 .string "DUCK$", 12
pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0 pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0
.string "DUCK$", 12 .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 .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 .string "PIG MONKEY$", 12
pokedex_entry 10, 320, gPrimeapePokedexText, 326, 10, 256, 0 pokedex_entry 10, 320, gPrimeapePokedexText, 326, 10, 256, 0
.string "PUPPY$", 12 .string "PUPPY$", 12
@@ -121,23 +121,23 @@ gPokedexEntries:: @ 856B5B0
.string "LEGENDARY$", 12 .string "LEGENDARY$", 12
pokedex_entry 19, 1550, gArcaninePokedexText, 256, 1, 312, 4 pokedex_entry 19, 1550, gArcaninePokedexText, 256, 1, 312, 4
.string "TADPOLE$", 12 .string "TADPOLE$", 12
pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0 pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0
.string "TADPOLE$", 12 .string "TADPOLE$", 12
pokedex_entry 10, 200, gPoliwhirlPokedexText, 288, 11, 256, 0 pokedex_entry 10, 200, gPoliwhirlPokedexText, 288, 11, 256, 0
.string "TADPOLE$", 12 .string "TADPOLE$", 12
pokedex_entry 13, 540, gPoliwrathPokedexText, 256, 6, 256, 0 pokedex_entry 13, 540, gPoliwrathPokedexText, 256, 6, 256, 0
.string "PSI$", 12 .string "PSI$", 12
pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0 pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0
.string "PSI$", 12 .string "PSI$", 12
pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0 pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0
.string "PSI$", 12 .string "PSI$", 12
pokedex_entry 15, 480, gAlakazamPokedexText, 256, 3, 256, 0 pokedex_entry 15, 480, gAlakazamPokedexText, 256, 3, 256, 0
.string "SUPERPOWER$", 12 .string "SUPERPOWER$", 12
pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0 pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0
.string "SUPERPOWER$", 12 .string "SUPERPOWER$", 12
pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0 pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0
.string "SUPERPOWER$", 12 .string "SUPERPOWER$", 12
pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1 pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1
.string "FLOWER$", 12 .string "FLOWER$", 12
pokedex_entry 7, 40, gBellsproutPokedexText, 354, 16, 256, 0 pokedex_entry 7, 40, gBellsproutPokedexText, 354, 16, 256, 0
.string "FLYCATCHER$", 12 .string "FLYCATCHER$", 12
@@ -149,19 +149,19 @@ gPokedexEntries:: @ 856B5B0
.string "JELLYFISH$", 12 .string "JELLYFISH$", 12
pokedex_entry 16, 550, gTentacruelPokedexText, 256, 0, 312, 1 pokedex_entry 16, 550, gTentacruelPokedexText, 256, 0, 312, 1
.string "ROCK$", 12 .string "ROCK$", 12
pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0 pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0
.string "ROCK$", 12 .string "ROCK$", 12
pokedex_entry 10, 1050, gGravelerPokedexText, 256, 2, 256, 0 pokedex_entry 10, 1050, gGravelerPokedexText, 256, 2, 256, 0
.string "MEGATON$", 12 .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 .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 .string "FIRE HORSE$", 12
pokedex_entry 17, 950, gRapidashPokedexText, 256, 0, 289, 1 pokedex_entry 17, 950, gRapidashPokedexText, 256, 0, 289, 1
.string "DOPEY$", 12 .string "DOPEY$", 12
pokedex_entry 12, 360, gSlowpokePokedexText, 256, 10, 256, 0 pokedex_entry 12, 360, gSlowpokePokedexText, 256, 10, 256, 0
.string "HERMIT CRAB$", 12 .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 .string "MAGNET$", 12
pokedex_entry 3, 60, gMagnemitePokedexText, 288, -9, 256, 0 pokedex_entry 3, 60, gMagnemitePokedexText, 288, -9, 256, 0
.string "MAGNET$", 12 .string "MAGNET$", 12
@@ -169,39 +169,39 @@ gPokedexEntries:: @ 856B5B0
.string "WILD DUCK$", 12 .string "WILD DUCK$", 12
pokedex_entry 8, 150, gFarfetchdPokedexText, 330, 2, 293, 2 pokedex_entry 8, 150, gFarfetchdPokedexText, 330, 2, 293, 2
.string "TWIN BIRD$", 12 .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 .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 .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 .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 .string "SLUDGE$", 12
pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0 pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0
.string "SLUDGE$", 12 .string "SLUDGE$", 12
pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0 pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0
.string "BIVALVE$", 12 .string "BIVALVE$", 12
pokedex_entry 3, 40, gShellderPokedexText, 675, 24, 256, 0 pokedex_entry 3, 40, gShellderPokedexText, 675, 24, 256, 0
.string "BIVALVE$", 12 .string "BIVALVE$", 12
pokedex_entry 15, 1325, gCloysterPokedexText, 256, 0, 269, 1 pokedex_entry 15, 1325, gCloysterPokedexText, 256, 0, 269, 1
.string "GAS$", 12 .string "GAS$", 12
pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0 pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0
.string "GAS$", 12 .string "GAS$", 12
pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2 pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2
.string "SHADOW$", 12 .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 .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 .string "HYPNOSIS$", 12
pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0 pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0
.string "HYPNOSIS$", 12 .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 .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 .string "PINCER$", 12
pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0 pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0
.string "BALL$", 12 .string "BALL$", 12
pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0 pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0
.string "BALL$", 12 .string "BALL$", 12
pokedex_entry 12, 666, gElectrodePokedexText, 256, 0, 256, 0 pokedex_entry 12, 666, gElectrodePokedexText, 256, 0, 256, 0
.string "EGG$", 12 .string "EGG$", 12
@@ -209,9 +209,9 @@ gPokedexEntries:: @ 856B5B0
.string "COCONUT$", 12 .string "COCONUT$", 12
pokedex_entry 20, 1200, gExeggutorPokedexText, 256, 0, 309, 5 pokedex_entry 20, 1200, gExeggutorPokedexText, 256, 0, 309, 5
.string "LONELY$", 12 .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 .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 .string "KICKING$", 12
pokedex_entry 15, 498, gHitmonleePokedexText, 256, 3, 259, 1 pokedex_entry 15, 498, gHitmonleePokedexText, 256, 3, 259, 1
.string "PUNCHING$", 12 .string "PUNCHING$", 12
@@ -219,101 +219,101 @@ gPokedexEntries:: @ 856B5B0
.string "LICKING$", 12 .string "LICKING$", 12
pokedex_entry 12, 655, gLickitungPokedexText, 256, 4, 256, 0 pokedex_entry 12, 655, gLickitungPokedexText, 256, 4, 256, 0
.string "POISON GAS$", 12 .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 .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 .string "SPIKES$", 12
pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0 pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0
.string "DRILL$", 12 .string "DRILL$", 12
pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2 pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2
.string "EGG$", 12 .string "EGG$", 12
pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0 pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0
.string "VINE$", 12 .string "VINE$", 12
pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0 pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0
.string "PARENT$", 12 .string "PARENT$", 12
pokedex_entry 22, 800, gKangaskhanPokedexText, 256, 0, 387, 8 pokedex_entry 22, 800, gKangaskhanPokedexText, 256, 0, 387, 8
.string "DRAGON$", 12 .string "DRAGON$", 12
pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0 pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0
.string "DRAGON$", 12 .string "DRAGON$", 12
pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0 pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0
.string "GOLDFISH$", 12 .string "GOLDFISH$", 12
pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0 pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0
.string "GOLDFISH$", 12 .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 .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 .string "MYSTERIOUS$", 12
pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0 pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0
.string "BARRIER$", 12 .string "BARRIER$", 12
pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0 pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0
.string "MANTIS$", 12 .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 .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 .string "ELECTRIC$", 12
pokedex_entry 11, 300, gElectabuzzPokedexText, 351, 8, 256, 0 pokedex_entry 11, 300, gElectabuzzPokedexText, 351, 8, 256, 0
.string "SPITFIRE$", 12 .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 .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 .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 .string "FISH$", 12
pokedex_entry 9, 100, gMagikarpPokedexText, 310, 4, 256, 0 pokedex_entry 9, 100, gMagikarpPokedexText, 310, 4, 256, 0
.string "ATROCIOUS$", 12 .string "ATROCIOUS$", 12
pokedex_entry 65, 2350, gGyaradosPokedexText, 256, 6, 481, 13 pokedex_entry 65, 2350, gGyaradosPokedexText, 256, 6, 481, 13
.string "TRANSPORT$", 12 .string "TRANSPORT$", 12
pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8 pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8
.string "TRANSFORM$", 12 .string "TRANSFORM$", 12
pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0 pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0
.string "EVOLUTION$", 12 .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 .string "BUBBLE JET$", 12
pokedex_entry 10, 290, gVaporeonPokedexText, 316, 8, 256, 0 pokedex_entry 10, 290, gVaporeonPokedexText, 316, 8, 256, 0
.string "LIGHTNING$", 12 .string "LIGHTNING$", 12
pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0 pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0
.string "FLAME$", 12 .string "FLAME$", 12
pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0 pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0
.string "VIRTUAL$", 12 .string "VIRTUAL$", 12
pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0 pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0
.string "SPIRAL$", 12 .string "SPIRAL$", 12
pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0 pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0
.string "SPIRAL$", 12 .string "SPIRAL$", 12
pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0 pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0
.string "SHELLFISH$", 12 .string "SHELLFISH$", 12
pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0 pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0
.string "SHELLFISH$", 12 .string "SHELLFISH$", 12
pokedex_entry 13, 405, gKabutopsPokedexText, 271, 3, 256, 0 pokedex_entry 13, 405, gKabutopsPokedexText, 271, 3, 256, 0
.string "FOSSIL$", 12 .string "FOSSIL$", 12
pokedex_entry 18, 590, gAerodactylPokedexText, 256, 0, 302, 4 pokedex_entry 18, 590, gAerodactylPokedexText, 256, 0, 302, 4
.string "SLEEPING$", 12 .string "SLEEPING$", 12
pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11 pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11
.string "FREEZE$", 12 .string "FREEZE$", 12
pokedex_entry 17, 554, gArticunoPokedexText, 256, 0, 309, 2 pokedex_entry 17, 554, gArticunoPokedexText, 256, 0, 309, 2
.string "ELECTRIC$", 12 .string "ELECTRIC$", 12
pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3 pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3
.string "FLAME$", 12 .string "FLAME$", 12
pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8 pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8
.string "DRAGON$", 12 .string "DRAGON$", 12
pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6 pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6
.string "DRAGON$", 12 .string "DRAGON$", 12
pokedex_entry 40, 165, gDragonairPokedexText, 256, 0, 411, 5 pokedex_entry 40, 165, gDragonairPokedexText, 256, 0, 411, 5
.string "DRAGON$", 12 .string "DRAGON$", 12
pokedex_entry 22, 2100, gDragonitePokedexText, 256, 0, 309, 4 pokedex_entry 22, 2100, gDragonitePokedexText, 256, 0, 309, 4
.string "GENETIC$", 12 .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 .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 .string "LEAF$", 12
pokedex_entry 9, 64, gChikoritaPokedexText, 512, 20, 256, 0 pokedex_entry 9, 64, gChikoritaPokedexText, 512, 20, 256, 0
.string "LEAF$", 12 .string "LEAF$", 12
pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0 pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0
.string "HERB$", 12 .string "HERB$", 12
pokedex_entry 18, 1005, gMeganiumPokedexText, 256, 0, 277, 1 pokedex_entry 18, 1005, gMeganiumPokedexText, 256, 0, 277, 1
.string "FIRE MOUSE$", 12 .string "FIRE MOUSE$", 12
pokedex_entry 5, 79, gCyndaquilPokedexText, 539, 21, 256, 0 pokedex_entry 5, 79, gCyndaquilPokedexText, 539, 21, 256, 0
.string "VOLCANO$", 12 .string "VOLCANO$", 12
pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0 pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0
.string "VOLCANO$", 12 .string "VOLCANO$", 12
pokedex_entry 17, 795, gTyphlosionPokedexText, 256, 0, 268, 1 pokedex_entry 17, 795, gTyphlosionPokedexText, 256, 0, 268, 1
.string "BIG JAW$", 12 .string "BIG JAW$", 12
@@ -323,51 +323,51 @@ gPokedexEntries:: @ 856B5B0
.string "BIG JAW$", 12 .string "BIG JAW$", 12
pokedex_entry 23, 888, gFeraligatrPokedexText, 256, 0, 342, 7 pokedex_entry 23, 888, gFeraligatrPokedexText, 256, 0, 342, 7
.string "SCOUT$", 12 .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 .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 .string "OWL$", 12
pokedex_entry 7, 212, gHoothootPokedexText, 380, -2, 256, 0 pokedex_entry 7, 212, gHoothootPokedexText, 380, -2, 256, 0
.string "OWL$", 12 .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 .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 .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 .string "STRING SPIT$", 12
pokedex_entry 5, 85, gSpinarakPokedexText, 414, 21, 256, 0 pokedex_entry 5, 85, gSpinarakPokedexText, 414, 21, 256, 0
.string "LONG LEG$", 12 .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 .string "BAT$", 12
pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1 pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1
.string "ANGLER$", 12 .string "ANGLER$", 12
pokedex_entry 5, 120, gChinchouPokedexText, 424, -2, 256, 0 pokedex_entry 5, 120, gChinchouPokedexText, 424, -2, 256, 0
.string "LIGHT$", 12 .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 .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 .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 .string "BALLOON$", 12
pokedex_entry 3, 10, gIgglybuffPokedexText, 457, -1, 256, 0 pokedex_entry 3, 10, gIgglybuffPokedexText, 457, -1, 256, 0
.string "SPIKE BALL$", 12 .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 .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 .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 .string "MYSTIC$", 12
pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4 pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4
.string "WOOL$", 12 .string "WOOL$", 12
pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0 pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0
.string "WOOL$", 12 .string "WOOL$", 12
pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0 pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0
.string "LIGHT$", 12 .string "LIGHT$", 12
pokedex_entry 14, 615, gAmpharosPokedexText, 256, 4, 256, 0 pokedex_entry 14, 615, gAmpharosPokedexText, 256, 4, 256, 0
.string "FLOWER$", 12 .string "FLOWER$", 12
pokedex_entry 4, 58, gBellossomPokedexText, 472, 21, 256, 0 pokedex_entry 4, 58, gBellossomPokedexText, 472, 21, 256, 0
.string "AQUA MOUSE$", 12 .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 .string "AQUA RABBIT$", 12
pokedex_entry 8, 285, gAzumarillPokedexText, 448, 16, 256, 0 pokedex_entry 8, 285, gAzumarillPokedexText, 448, 16, 256, 0
.string "IMITATION$", 12 .string "IMITATION$", 12
@@ -375,49 +375,49 @@ gPokedexEntries:: @ 856B5B0
.string "FROG$", 12 .string "FROG$", 12
pokedex_entry 11, 339, gPolitoedPokedexText, 289, 6, 256, 0 pokedex_entry 11, 339, gPolitoedPokedexText, 289, 6, 256, 0
.string "COTTONWEED$", 12 .string "COTTONWEED$", 12
pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0 pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0
.string "COTTONWEED$", 12 .string "COTTONWEED$", 12
pokedex_entry 6, 10, gSkiploomPokedexText, 387, 0, 256, 0 pokedex_entry 6, 10, gSkiploomPokedexText, 387, 0, 256, 0
.string "COTTONWEED$", 12 .string "COTTONWEED$", 12
pokedex_entry 8, 30, gJumpluffPokedexText, 418, -4, 256, 0 pokedex_entry 8, 30, gJumpluffPokedexText, 418, -4, 256, 0
.string "LONG TAIL$", 12 .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 .string "SEED$", 12
pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0 pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0
.string "SUN$", 12 .string "SUN$", 12
pokedex_entry 8, 85, gSunfloraPokedexText, 444, 15, 256, 0 pokedex_entry 8, 85, gSunfloraPokedexText, 444, 15, 256, 0
.string "CLEAR WING$", 12 .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 .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 .string "WATER FISH$", 12
pokedex_entry 14, 750, gQuagsirePokedexText, 256, 4, 256, 0 pokedex_entry 14, 750, gQuagsirePokedexText, 256, 4, 256, 0
.string "SUN$", 12 .string "SUN$", 12
pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0 pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0
.string "MOONLIGHT$", 12 .string "MOONLIGHT$", 12
pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0 pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0
.string "DARKNESS$", 12 .string "DARKNESS$", 12
pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1 pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1
.string "ROYAL$", 12 .string "ROYAL$", 12
pokedex_entry 20, 795, gSlowkingPokedexText, 256, 0, 309, 5 pokedex_entry 20, 795, gSlowkingPokedexText, 256, 0, 309, 5
.string "SCREECH$", 12 .string "SCREECH$", 12
pokedex_entry 7, 10, gMisdreavusPokedexText, 407, -8, 256, 0 pokedex_entry 7, 10, gMisdreavusPokedexText, 407, -8, 256, 0
.string "SYMBOL$", 12 .string "SYMBOL$", 12
pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0 pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0
.string "PATIENT$", 12 .string "PATIENT$", 12
pokedex_entry 13, 285, gWobbuffetPokedexText, 274, 4, 256, 0 pokedex_entry 13, 285, gWobbuffetPokedexText, 274, 4, 256, 0
.string "LONG NECK$", 12 .string "LONG NECK$", 12
pokedex_entry 15, 415, gGirafarigPokedexText, 281, 1, 256, 0 pokedex_entry 15, 415, gGirafarigPokedexText, 281, 1, 256, 0
.string "BAGWORM$", 12 .string "BAGWORM$", 12
pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0 pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0
.string "BAGWORM$", 12 .string "BAGWORM$", 12
pokedex_entry 12, 1258, gForretressPokedexText, 293, 5, 256, 0 pokedex_entry 12, 1258, gForretressPokedexText, 293, 5, 256, 0
.string "LAND SNAKE$", 12 .string "LAND SNAKE$", 12
pokedex_entry 15, 140, gDunsparcePokedexText, 316, 17, 256, 0 pokedex_entry 15, 140, gDunsparcePokedexText, 316, 17, 256, 0
.string "FLYSCORPION$", 12 .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 .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 .string "FAIRY$", 12
pokedex_entry 6, 78, gSnubbullPokedexText, 465, 19, 256, 0 pokedex_entry 6, 78, gSnubbullPokedexText, 465, 19, 256, 0
.string "FAIRY$", 12 .string "FAIRY$", 12
@@ -425,27 +425,27 @@ gPokedexEntries:: @ 856B5B0
.string "BALLOON$", 12 .string "BALLOON$", 12
pokedex_entry 5, 39, gQwilfishPokedexText, 430, 0, 256, 0 pokedex_entry 5, 39, gQwilfishPokedexText, 430, 0, 256, 0
.string "PINCER$", 12 .string "PINCER$", 12
pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0 pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0
.string "MOLD$", 12 .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 .string "SINGLE HORN$", 12
pokedex_entry 15, 540, gHeracrossPokedexText, 256, 0, 256, 0 pokedex_entry 15, 540, gHeracrossPokedexText, 256, 0, 256, 0
.string "SHARP CLAW$", 12 .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 .string "LITTLE BEAR$", 12
pokedex_entry 6, 88, gTeddiursaPokedexText, 455, 19, 256, 0 pokedex_entry 6, 88, gTeddiursaPokedexText, 455, 19, 256, 0
.string "HIBERNATOR$", 12 .string "HIBERNATOR$", 12
pokedex_entry 18, 1258, gUrsaringPokedexText, 256, 0, 256, 0 pokedex_entry 18, 1258, gUrsaringPokedexText, 256, 0, 256, 0
.string "LAVA$", 12 .string "LAVA$", 12
pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0 pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0
.string "LAVA$", 12 .string "LAVA$", 12
pokedex_entry 8, 550, gMagcargoPokedexText, 332, 15, 256, 0 pokedex_entry 8, 550, gMagcargoPokedexText, 332, 15, 256, 0
.string "PIG$", 12 .string "PIG$", 12
pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0 pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0
.string "SWINE$", 12 .string "SWINE$", 12
pokedex_entry 11, 558, gPiloswinePokedexText, 306, 10, 256, 0 pokedex_entry 11, 558, gPiloswinePokedexText, 306, 10, 256, 0
.string "CORAL$", 12 .string "CORAL$", 12
pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0 pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0
.string "JET$", 12 .string "JET$", 12
pokedex_entry 6, 120, gRemoraidPokedexText, 316, 4, 256, 0 pokedex_entry 6, 120, gRemoraidPokedexText, 316, 4, 256, 0
.string "JET$", 12 .string "JET$", 12
@@ -453,7 +453,7 @@ gPokedexEntries:: @ 856B5B0
.string "DELIVERY$", 12 .string "DELIVERY$", 12
pokedex_entry 9, 160, gDelibirdPokedexText, 293, 11, 256, 0 pokedex_entry 9, 160, gDelibirdPokedexText, 293, 11, 256, 0
.string "KITE$", 12 .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 .string "ARMOR BIRD$", 12
pokedex_entry 17, 505, gSkarmoryPokedexText, 256, 0, 271, 1 pokedex_entry 17, 505, gSkarmoryPokedexText, 256, 0, 271, 1
.string "DARK$", 12 .string "DARK$", 12
@@ -461,11 +461,11 @@ gPokedexEntries:: @ 856B5B0
.string "DARK$", 12 .string "DARK$", 12
pokedex_entry 14, 350, gHoundoomPokedexText, 256, 4, 256, 0 pokedex_entry 14, 350, gHoundoomPokedexText, 256, 4, 256, 0
.string "DRAGON$", 12 .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 .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 .string "ARMOR$", 12
pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0 pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0
.string "VIRTUAL$", 12 .string "VIRTUAL$", 12
pokedex_entry 6, 325, gPorygon2PokedexText, 320, 17, 256, 0 pokedex_entry 6, 325, gPorygon2PokedexText, 320, 17, 256, 0
.string "BIG HORN$", 12 .string "BIG HORN$", 12
@@ -473,51 +473,51 @@ gPokedexEntries:: @ 856B5B0
.string "PAINTER$", 12 .string "PAINTER$", 12
pokedex_entry 12, 580, gSmearglePokedexText, 287, 5, 256, 0 pokedex_entry 12, 580, gSmearglePokedexText, 287, 5, 256, 0
.string "SCUFFLE$", 12 .string "SCUFFLE$", 12
pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0 pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0
.string "HANDSTAND$", 12 .string "HANDSTAND$", 12
pokedex_entry 14, 480, gHitmontopPokedexText, 256, 2, 257, 0 pokedex_entry 14, 480, gHitmontopPokedexText, 256, 2, 257, 0
.string "KISS$", 12 .string "KISS$", 12
pokedex_entry 4, 60, gSmoochumPokedexText, 440, 20, 256, 0 pokedex_entry 4, 60, gSmoochumPokedexText, 440, 20, 256, 0
.string "ELECTRIC$", 12 .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 .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 .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 .string "HAPPINESS$", 12
pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3 pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3
.string "THUNDER$", 12 .string "THUNDER$", 12
pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7 pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7
.string "VOLCANO$", 12 .string "VOLCANO$", 12
pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7 pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7
.string "AURORA$", 12 .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 .string "ROCK SKIN$", 12
pokedex_entry 6, 720, gLarvitarPokedexText, 472, 18, 256, 0 pokedex_entry 6, 720, gLarvitarPokedexText, 472, 18, 256, 0
.string "HARD SHELL$", 12 .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 .string "ARMOR$", 12
pokedex_entry 20, 2020, gTyranitarPokedexText, 256, 0, 345, 7 pokedex_entry 20, 2020, gTyranitarPokedexText, 256, 0, 345, 7
.string "DIVING$", 12 .string "DIVING$", 12
pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19 pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19
.string "RAINBOW$", 12 .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 .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 .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 .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 .string "FOREST$", 12
pokedex_entry 17, 522, gSceptilePokedexText, 256, -1, 275, 2 pokedex_entry 17, 522, gSceptilePokedexText, 256, -1, 275, 2
.string "CHICK$", 12 .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 .string "YOUNG FOWL$", 12
pokedex_entry 9, 195, gCombuskenPokedexText, 343, 5, 256, 0 pokedex_entry 9, 195, gCombuskenPokedexText, 343, 5, 256, 0
.string "BLAZE$", 12 .string "BLAZE$", 12
pokedex_entry 19, 520, gBlazikenPokedexText, 256, 0, 301, 4 pokedex_entry 19, 520, gBlazikenPokedexText, 256, 0, 301, 4
.string "MUD FISH$", 12 .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 .string "MUD FISH$", 12
pokedex_entry 7, 280, gMarshtompPokedexText, 340, 7, 256, 0 pokedex_entry 7, 280, gMarshtompPokedexText, 340, 7, 256, 0
.string "MUD FISH$", 12 .string "MUD FISH$", 12
@@ -529,91 +529,91 @@ gPokedexEntries:: @ 856B5B0
.string "TINYRACCOON$", 12 .string "TINYRACCOON$", 12
pokedex_entry 4, 175, gZigzagoonPokedexText, 560, 22, 256, 0 pokedex_entry 4, 175, gZigzagoonPokedexText, 560, 22, 256, 0
.string "RUSHING$", 12 .string "RUSHING$", 12
pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0 pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0
.string "WORM$", 12 .string "WORM$", 12
pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0 pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0
.string "COCOON$", 12 .string "COCOON$", 12
pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0 pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0
.string "BUTTERFLY$", 12 .string "BUTTERFLY$", 12
pokedex_entry 10, 284, gBeautiflyPokedexText, 298, -1, 256, 0 pokedex_entry 10, 284, gBeautiflyPokedexText, 298, -1, 256, 0
.string "COCOON$", 12 .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 .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 .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 .string "JOLLY$", 12
pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0 pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0
.string "CAREFREE$", 12 .string "CAREFREE$", 12
pokedex_entry 15, 550, gLudicoloPokedexText, 256, 0, 268, -1 pokedex_entry 15, 550, gLudicoloPokedexText, 256, 0, 268, -1
.string "ACORN$", 12 .string "ACORN$", 12
pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0 pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0
.string "WILY$", 12 .string "WILY$", 12
pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0 pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0
.string "WICKED$", 12 .string "WICKED$", 12
pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0 pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0
.string "TINYSWALLOW$", 12 .string "TINYSWALLOW$", 12
pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0 pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0
.string "SWALLOW$", 12 .string "SWALLOW$", 12
pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0 pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0
.string "SEAGULL$", 12 .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 .string "WATER BIRD$", 12
pokedex_entry 12, 280, gPelipperPokedexText, 288, 1, 256, 0 pokedex_entry 12, 280, gPelipperPokedexText, 288, 1, 256, 0
.string "FEELING$", 12 .string "FEELING$", 12
pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0 pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0
.string "EMOTION$", 12 .string "EMOTION$", 12
pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0 pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0
.string "EMBRACE$", 12 .string "EMBRACE$", 12
pokedex_entry 16, 484, gGardevoirPokedexText, 256, 0, 256, 0 pokedex_entry 16, 484, gGardevoirPokedexText, 256, 0, 256, 0
.string "POND SKATER$", 12 .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 .string "EYEBALL$", 12
pokedex_entry 8, 36, gMasquerainPokedexText, 378, 8, 256, 0 pokedex_entry 8, 36, gMasquerainPokedexText, 378, 8, 256, 0
.string "MUSHROOM$", 12 .string "MUSHROOM$", 12
pokedex_entry 4, 45, gShroomishPokedexText, 513, 22, 256, 0 pokedex_entry 4, 45, gShroomishPokedexText, 513, 22, 256, 0
.string "MUSHROOM$", 12 .string "MUSHROOM$", 12
pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0 pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0
.string "SLACKER$", 12 .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 .string "WILD MONKEY$", 12
pokedex_entry 14, 465, gVigorothPokedexText, 301, 2, 256, 0 pokedex_entry 14, 465, gVigorothPokedexText, 301, 2, 256, 0
.string "LAZY$", 12 .string "LAZY$", 12
pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1 pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1
.string "TRAINEE$", 12 .string "TRAINEE$", 12
pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0 pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0
.string "NINJA$", 12 .string "NINJA$", 12
pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0 pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0
.string "SHED$", 12 .string "SHED$", 12
pokedex_entry 8, 12, gShedinjaPokedexText, 372, -8, 256, 0 pokedex_entry 8, 12, gShedinjaPokedexText, 372, -8, 256, 0
.string "WHISPER$", 12 .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 .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 .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 .string "GUTS$", 12
pokedex_entry 10, 864, gMakuhitaPokedexText, 256, 10, 256, 0 pokedex_entry 10, 864, gMakuhitaPokedexText, 256, 10, 256, 0
.string "ARM THRUST$", 12 .string "ARM THRUST$", 12
pokedex_entry 23, 2538, gHariyamaPokedexText, 256, 0, 343, 7 pokedex_entry 23, 2538, gHariyamaPokedexText, 256, 0, 343, 7
.string "POLKA DOT$", 12 .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 .string "COMPASS$", 12
pokedex_entry 10, 970, gNosepassPokedexText, 256, 9, 289, 3 pokedex_entry 10, 970, gNosepassPokedexText, 256, 9, 289, 3
.string "KITTEN$", 12 .string "KITTEN$", 12
pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0 pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0
.string "PRIM$", 12 .string "PRIM$", 12
pokedex_entry 11, 326, gDelcattyPokedexText, 322, 10, 256, 0 pokedex_entry 11, 326, gDelcattyPokedexText, 322, 10, 256, 0
.string "DARKNESS$", 12 .string "DARKNESS$", 12
pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0 pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0
.string "DECEIVER$", 12 .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 .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 .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 .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 .string "MEDITATE$", 12
pokedex_entry 6, 112, gMedititePokedexText, 465, 17, 256, 0 pokedex_entry 6, 112, gMedititePokedexText, 465, 17, 256, 0
.string "MEDITATE$", 12 .string "MEDITATE$", 12
@@ -623,61 +623,61 @@ gPokedexEntries:: @ 856B5B0
.string "DISCHARGE$", 12 .string "DISCHARGE$", 12
pokedex_entry 15, 402, gManectricPokedexText, 256, 3, 257, 0 pokedex_entry 15, 402, gManectricPokedexText, 256, 3, 257, 0
.string "CHEERING$", 12 .string "CHEERING$", 12
pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0 pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0
.string "CHEERING$", 12 .string "CHEERING$", 12
pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0 pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0
.string "FIREFLY$", 12 .string "FIREFLY$", 12
pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0 pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0
.string "FIREFLY$", 12 .string "FIREFLY$", 12
pokedex_entry 6, 177, gIllumisePokedexText, 572, 19, 256, 0 pokedex_entry 6, 177, gIllumisePokedexText, 572, 19, 256, 0
.string "THORN$", 12 .string "THORN$", 12
pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0 pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0
.string "STOMACH$", 12 .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 .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 .string "SAVAGE$", 12
pokedex_entry 8, 208, gCarvanhaPokedexText, 362, 0, 256, 0 pokedex_entry 8, 208, gCarvanhaPokedexText, 362, 0, 256, 0
.string "BRUTAL$", 12 .string "BRUTAL$", 12
pokedex_entry 18, 888, gSharpedoPokedexText, 256, 0, 317, 3 pokedex_entry 18, 888, gSharpedoPokedexText, 256, 0, 317, 3
.string "BALL WHALE$", 12 .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 .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 .string "NUMB$", 12
pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0 pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0
.string "ERUPTION$", 12 .string "ERUPTION$", 12
pokedex_entry 19, 2200, gCameruptPokedexText, 256, 7, 345, 6 pokedex_entry 19, 2200, gCameruptPokedexText, 256, 7, 345, 6
.string "COAL$", 12 .string "COAL$", 12
pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0 pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0
.string "BOUNCE$", 12 .string "BOUNCE$", 12
pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0 pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0
.string "MANIPULATE$", 12 .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 .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 .string "ANT PIT$", 12
pokedex_entry 7, 150, gTrapinchPokedexText, 298, 17, 256, 0 pokedex_entry 7, 150, gTrapinchPokedexText, 298, 17, 256, 0
.string "VIBRATION$", 12 .string "VIBRATION$", 12
pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0 pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0
.string "MYSTIC$", 12 .string "MYSTIC$", 12
pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1 pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1
.string "CACTUS$", 12 .string "CACTUS$", 12
pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0 pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0
.string "SCARECROW$", 12 .string "SCARECROW$", 12
pokedex_entry 13, 774, gCacturnePokedexText, 327, 5, 256, 0 pokedex_entry 13, 774, gCacturnePokedexText, 327, 5, 256, 0
.string "COTTON BIRD$", 12 .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 .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 .string "CAT FERRET$", 12
pokedex_entry 13, 403, gZangoosePokedexText, 256, 3, 256, 0 pokedex_entry 13, 403, gZangoosePokedexText, 256, 3, 256, 0
.string "FANG SNAKE$", 12 .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 .string "METEORITE$", 12
pokedex_entry 10, 1680, gLunatonePokedexText, 300, 3, 256, 0 pokedex_entry 10, 1680, gLunatonePokedexText, 300, 3, 256, 0
.string "METEORITE$", 12 .string "METEORITE$", 12
pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0 pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0
.string "WHISKERS$", 12 .string "WHISKERS$", 12
pokedex_entry 4, 19, gBarboachPokedexText, 581, -3, 256, 0 pokedex_entry 4, 19, gBarboachPokedexText, 581, -3, 256, 0
.string "WHISKERS$", 12 .string "WHISKERS$", 12
@@ -687,90 +687,90 @@ gPokedexEntries:: @ 856B5B0
.string "ROGUE$", 12 .string "ROGUE$", 12
pokedex_entry 11, 328, gCrawdauntPokedexText, 365, 9, 256, 0 pokedex_entry 11, 328, gCrawdauntPokedexText, 365, 9, 256, 0
.string "CLAY DOLL$", 12 .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 .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 .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 .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 .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 .string "PLATE$", 12
pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0 pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0
.string "FISH$", 12 .string "FISH$", 12
pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0 pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0
.string "TENDER$", 12 .string "TENDER$", 12
pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7 pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7
.string "WEATHER$", 12 .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 .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 .string "PUPPET$", 12
pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0 pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0
.string "MARIONETTE$", 12 .string "MARIONETTE$", 12
pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0 pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0
.string "REQUIEM$", 12 .string "REQUIEM$", 12
pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0 pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0
.string "BECKON$", 12 .string "BECKON$", 12
pokedex_entry 16, 306, gDusclopsPokedexText, 256, 3, 299, 1 pokedex_entry 16, 306, gDusclopsPokedexText, 256, 3, 299, 1
.string "FRUIT$", 12 .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 .string "WIND CHIME$", 12
pokedex_entry 6, 10, gChimechoPokedexText, 505, 0, 256, 0 pokedex_entry 6, 10, gChimechoPokedexText, 505, 0, 256, 0
.string "DISASTER$", 12 .string "DISASTER$", 12
pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0 pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0
.string "BRIGHT$", 12 .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 .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 .string "FACE$", 12
pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0 pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0
.string "CLAP$", 12 .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 .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 .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 .string "BIVALVE$", 12
pokedex_entry 4, 525, gClamperlPokedexText, 691, 22, 256, 0 pokedex_entry 4, 525, gClamperlPokedexText, 691, 22, 256, 0
.string "DEEP SEA$", 12 .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 .string "SOUTH SEA$", 12
pokedex_entry 18, 226, gGorebyssPokedexText, 278, 5, 256, 0 pokedex_entry 18, 226, gGorebyssPokedexText, 278, 5, 256, 0
.string "LONGEVITY$", 12 .string "LONGEVITY$", 12
pokedex_entry 10, 234, gRelicanthPokedexText, 316, 7, 256, 0 pokedex_entry 10, 234, gRelicanthPokedexText, 316, 7, 256, 0
.string "RENDEZVOUS$", 12 .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 .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 .string "ENDURANCE$", 12
pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0 pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0
.string "DRAGON$", 12 .string "DRAGON$", 12
pokedex_entry 15, 1026, gSalamencePokedexText, 256, 0, 256, 0 pokedex_entry 15, 1026, gSalamencePokedexText, 256, 0, 256, 0
.string "IRON BALL$", 12 .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 .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 .string "IRON LEG$", 12
pokedex_entry 16, 5500, gMetagrossPokedexText, 256, 4, 447, 9 pokedex_entry 16, 5500, gMetagrossPokedexText, 256, 4, 447, 9
.string "ROCK PEAK$", 12 .string "ROCK PEAK$", 12
pokedex_entry 17, 2300, gRegirockPokedexText, 256, 2, 309, 1 pokedex_entry 17, 2300, gRegirockPokedexText, 256, 2, 309, 1
.string "ICEBERG$", 12 .string "ICEBERG$", 12
pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2 pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2
.string "IRON$", 12 .string "IRON$", 12
pokedex_entry 19, 2050, gRegisteelPokedexText, 256, 0, 359, 6 pokedex_entry 19, 2050, gRegisteelPokedexText, 256, 0, 359, 6
.string "EON$", 12 .string "EON$", 12
pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0 pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0
.string "EON$", 12 .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 .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 .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 .string "SKY HIGH$", 12
pokedex_entry 70, 2065, gRayquazaPokedexText, 256, 0, 448, 12 pokedex_entry 70, 2065, gRayquazaPokedexText, 256, 0, 448, 12
.string "WISH$", 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 .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 "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0 .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
gUnknown_0857173C:: @ 857173C gUnknown_0857173C:: @ 857173C
.incbin "baserom.gba", 0x57173c, 0x20 .incbin "baserom.gba", 0x57173c, 0x20
@@ -59,7 +44,13 @@ gUnknown_085724A4:: @ 85724A4
.incbin "baserom.gba", 0x5724a4, 0x18 .incbin "baserom.gba", 0x5724a4, 0x18
gUnknown_085724BC:: @ 85724BC 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 gUnknown_085726F4:: @ 85726F4
.incbin "baserom.gba", 0x5726f4, 0x20 .incbin "baserom.gba", 0x5726f4, 0x20
@@ -71,28 +62,126 @@ gUnknown_08572734:: @ 8572734
.incbin "baserom.gba", 0x572734, 0x10 .incbin "baserom.gba", 0x572734, 0x10
gUnknown_08572744:: @ 8572744 gUnknown_08572744:: @ 8572744
.incbin "baserom.gba", 0x572744, 0x8 obj_pal gUnknown_085724D4, 0xDACA
gUnknown_0857274C:: @ 857274C gUnknown_0857274C:: @ 857274C
.incbin "baserom.gba", 0x57274c, 0x8 obj_tiles gUnknown_085724F4, 0x1C0, 5
gUnknown_08572754:: @ 8572754 gUnknown_08572754:: @ 8572754
.incbin "baserom.gba", 0x572754, 0x18 spr_template 2, 0xDAC6, gOamData_857286C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0857276C:: @ 857276C 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 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 gUnknown_085728BC:: @ 85728BC
.incbin "baserom.gba", 0x5728bc, 0x18 spr_template 5, 0xDACA, gOamData_8572874, gSpriteAnimTable_85728AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085728D4:: @ 85728D4 gUnknown_085728D4:: @ 85728D4
.incbin "baserom.gba", 0x5728d4, 0x48 spr_template 0x12, 0xDAC0, gOamData_85728EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0857291C:: @ 857291C .align 2
.incbin "baserom.gba", 0x57291c, 0x4c58 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 gUnknown_08577574:: @ 8577574
.incbin "baserom.gba", 0x577574, 0x44 .incbin "baserom.gba", 0x577574, 0x44
data/pokemon_summary_screen.s
+8 -2
View File
@@ -121,7 +121,12 @@ gUnknown_0861F2C0:: @ 861F2C0
.incbin "baserom.gba", 0x61f2c0, 0x18 .incbin "baserom.gba", 0x61f2c0, 0x18
gUnknown_0861F2D8:: @ 861F2D8 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 gUnknown_0861F308:: @ 861F308
.incbin "baserom.gba", 0x61f308, 0x4 .incbin "baserom.gba", 0x61f308, 0x4
@@ -136,7 +141,8 @@ gUnknown_0861F310:: @ 861F310
.incbin "baserom.gba", 0x61f310, 0x4 .incbin "baserom.gba", 0x61f310, 0x4
gUnknown_0861F314:: @ 861F314 gUnknown_0861F314:: @ 861F314
.incbin "baserom.gba", 0x61f314, 0x8 .4byte sub_81C654C
.4byte sub_81C63D0
gUnknown_0861F31C:: @ 861F31C gUnknown_0861F31C:: @ 861F31C
.incbin "baserom.gba", 0x61f31c, 0xc .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" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_0858CF8C:: @ 858CF8C gUnknown_0858CF8C:: @ 858CF8C
.incbin "baserom.gba", 0x58cf8c, 0x2 .incbin "baserom.gba", 0x58cf8c, 0x2
data/reset_rtc_screen.s
+4 -4
View File
@@ -1,8 +1,8 @@
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_08510404:: @ 8510404 struct BgTemplate gUnknown_08510404:: @ 8510404 struct BgTemplate
.4byte 0x000001f0 .4byte 0x000001f0
data/rom_8486FEC.s
+4 -4
View File
@@ -1,8 +1,8 @@
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_8486FEC:: @ 8486FEC gUnknown_8486FEC:: @ 8486FEC
.incbin "baserom.gba", 0x486fec, 0xFFA0 .incbin "baserom.gba", 0x486fec, 0xFFA0
data/rom_8525F58.s
+9 -9
View File
@@ -1,34 +1,34 @@
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2 .align 2
gUnknown_08525F58:: @ 8525F58 gUnknown_08525F58:: @ 8525F58
.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00 .byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00 .byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00 .byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00 .byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
.align 2 .align 2
gCastformFrontSpriteCoords:: @ 8525F78 gCastformFrontSpriteCoords:: @ 8525F78
.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00 .byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00 .byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
.align 2 .align 2
gUnknown_08525F88:: @ 8525F88 gUnknown_08525F88:: @ 8525F88
.byte 0x0d, 0x0e, 0x0d, 0x0d .byte 0x0d, 0x0e, 0x0d, 0x0d
.align 2 .align 2
gUnknown_08525F8C:: @ 8525F8C gUnknown_08525F8C:: @ 8525F8C
.byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00
.align 2 .align 2
gUnknown_08525F90:: @ 8525F90 gUnknown_08525F90:: @ 8525F90
spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2 .align 2
gUnknown_08525FC0:: @ 8525FC0 gUnknown_08525FC0:: @ 8525FC0
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755 obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756 obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
data/save.s
+14 -14
View File
@@ -4,17 +4,17 @@
.section .rodata .section .rodata
gSaveSectionOffsets:: @ 85CDC00 gSaveSectionOffsets:: @ 85CDC00
.2byte 0, 0xF2C .2byte 0, 0xF2C
.2byte 0, 0xF80 .2byte 0, 0xF80
.2byte 0xF80, 0xF80 .2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80 .2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF08 .2byte 0x2E80, 0xF08
.2byte 0, 0xF80 .2byte 0, 0xF80
.2byte 0xF80, 0xF80 .2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80 .2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF80 .2byte 0x2E80, 0xF80
.2byte 0x3E00, 0xF80 .2byte 0x3E00, 0xF80
.2byte 0x4D80, 0xF80 .2byte 0x4D80, 0xF80
.2byte 0x5D00, 0xF80 .2byte 0x5D00, 0xF80
.2byte 0x6C80, 0xF80 .2byte 0x6C80, 0xF80
.2byte 0x7C00, 0x7D0 .2byte 0x7C00, 0x7D0
data/script_menu.s
+1 -1
View File
@@ -728,7 +728,7 @@ gUnknown_0858BAF0:: @ 858BAF0
gUnknown_0858BB68:: @ 858BB68 gUnknown_0858BB68:: @ 858BB68
.byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F .byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F
.align 2 .align 2
gUnknown_0858BB70:: @ 858BB70 gUnknown_0858BB70:: @ 858BB70
.4byte gText_SomeonesPC .4byte gText_SomeonesPC
.4byte gText_LanettesPC .4byte gText_LanettesPC
data/script_pokemon_util_80F87D8.s
+2 -2
View File
@@ -2,6 +2,6 @@
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_0858D8EC:: @ 858D8EC gUnknown_0858D8EC:: @ 858D8EC
.incbin "baserom.gba", 0x58d8ec, 0x4 .byte 3, 4, 5, 14
data/specials.inc
+4 -4
View File
@@ -1,11 +1,11 @@
.macro def_special ptr .macro def_special ptr
.set SPECIAL_\ptr, __special__ .set SPECIAL_\ptr, __special__
.set __special__, __special__ + 1 .set __special__, __special__ + 1
.4byte \ptr .4byte \ptr
.endm .endm
.set __special__, 0 .set __special__, 0
.align 2 .align 2
gSpecials:: @ 81DBA64 gSpecials:: @ 81DBA64
def_special HealPlayerParty def_special HealPlayerParty
def_special sub_809D2BC def_special sub_809D2BC
@@ -163,7 +163,7 @@ gSpecials:: @ 81DBA64
def_special SetFlagInVar def_special SetFlagInVar
def_special CableCarWarp def_special CableCarWarp
def_special sub_814FC9C def_special sub_814FC9C
def_special sub_8085784 def_special Overworld_PlaySpecialMapMusic
def_special StartWallClock def_special StartWallClock
def_special Special_ViewWallClock def_special Special_ViewWallClock
def_special ChooseStarter 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 "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.include "include/constants/species.h"
.section .rodata .section .rodata
@@ -36,8 +35,11 @@ gStarterChoose_LabelCoords:: @ 85B1DF2
.incbin "baserom.gba", 0x5b1df2, 0x6 .incbin "baserom.gba", 0x5b1df2, 0x6
sStarterMon:: @ 85B1DF8 sStarterMon:: @ 85B1DF8
.incbin "baserom.gba", 0x5b1df8, 0x8 .2byte SPECIES_TREECKO
.2byte SPECIES_TORCHIC
.2byte SPECIES_MUDKIP
.align 2
gUnknown_085B1E00:: @ 85B1E00 gUnknown_085B1E00:: @ 85B1E00
.incbin "baserom.gba", 0x5b1e00, 0xc .incbin "baserom.gba", 0x5b1e00, 0xc
data/strings.s
+30 -31
View File
@@ -2705,34 +2705,34 @@ gUnknown_085EBB4F:: @ 85EBB4F
gUnknown_085EBB56:: @ 85EBB56 gUnknown_085EBB56:: @ 85EBB56
.string "What would you like to do?$" .string "What would you like to do?$"
gUnknown_085EBB71:: @ 85EBB71 gText_WithdrawPokemon:: @ 85EBB71
.string "WITHDRAW POKéMON$" .string "WITHDRAW POKéMON$"
gUnknown_085EBB82:: @ 85EBB82 gText_DepositPokemon:: @ 85EBB82
.string "DEPOSIT POKéMON$" .string "DEPOSIT POKéMON$"
gUnknown_085EBB92:: @ 85EBB92 gText_MovePokemon:: @ 85EBB92
.string "MOVE POKéMON$" .string "MOVE POKéMON$"
gUnknown_085EBB9F:: @ 85EBB9F gText_MoveItems:: @ 85EBB9F
.string "MOVE ITEMS$" .string "MOVE ITEMS$"
gUnknown_085EBBAA:: @ 85EBBAA gText_SeeYa:: @ 85EBBAA
.string "SEE YA!$" .string "SEE YA!$"
gUnknown_085EBBB2:: @ 85EBBB2 gText_WithdrawMonDescription:: @ 85EBBB2
.string "Move POKéMON stored in BOXES to\nyour party.$" .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.$" .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.$" .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.$" .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.$" .string "Return to the previous menu.$"
gText_JustOnePkmn:: @ 85EBC89 gText_JustOnePkmn:: @ 85EBC89
@@ -3521,10 +3521,10 @@ gText_Var1sTrainerCard:: @ 85ECFA6
gText_HallOfFameDebut:: @ 85ECFB8 gText_HallOfFameDebut:: @ 85ECFB8
.string "HALL OF FAME DEBUT $" .string "HALL OF FAME DEBUT $"
gUnknown_085ECFCD:: @ 85ECFCD gText_LinkBattles:: @ 85ECFCD
.string "LINK BATTLES$" .string "LINK BATTLES$"
gUnknown_085ECFDA:: @ 85ECFDA gText_LinkCableBattles:: @ 85ECFDA
.string "LINK CABLE BATTLES$" .string "LINK CABLE BATTLES$"
gText_WinsLosses:: @ 85ECFED gText_WinsLosses:: @ 85ECFED
@@ -4488,34 +4488,34 @@ gUnknown_085EE6AD:: @ 85EE6AD
gUnknown_085EE6B6:: @ 85EE6B6 gUnknown_085EE6B6:: @ 85EE6B6
.string "Updated time$" .string "Updated time$"
gUnknown_085EE6C3:: @ 85EE6C3 gText_MenuPokedex:: @ 85EE6C3
.string "POKéDEX$" .string "POKéDEX$"
gUnknown_085EE6CB:: @ 85EE6CB gText_MenuPokemon:: @ 85EE6CB
.string "POKéMON$" .string "POKéMON$"
gUnknown_085EE6D3:: @ 85EE6D3 gText_MenuBag:: @ 85EE6D3
.string "BAG$" .string "BAG$"
gUnknown_085EE6D7:: @ 85EE6D7 gText_MenuPokenav:: @ 85EE6D7
.string "POKéNAV$" .string "POKéNAV$"
gUnknown_085EE6DF:: @ 85EE6DF gText_MenuPlayer:: @ 85EE6DF
.string "{PLAYER}$" .string "{PLAYER}$"
gUnknown_085EE6E2:: @ 85EE6E2 gText_MenuSave:: @ 85EE6E2
.string "SAVE$" .string "SAVE$"
gUnknown_085EE6E7:: @ 85EE6E7 gText_MenuOption:: @ 85EE6E7
.string "OPTION$" .string "OPTION$"
gUnknown_085EE6EE:: @ 85EE6EE gText_MenuExit:: @ 85EE6EE
.string "EXIT$" .string "EXIT$"
gUnknown_085EE6F3:: @ 85EE6F3 gText_MenuRetire:: @ 85EE6F3
.string "RETIRE$" .string "RETIRE$"
gUnknown_085EE6FA:: @ 85EE6FA gText_MenuRest:: @ 85EE6FA
.string "REST$" .string "REST$"
gText_SafariBallStock:: @ 85EE6FF gText_SafariBallStock:: @ 85EE6FF
@@ -4524,28 +4524,28 @@ gText_SafariBallStock:: @ 85EE6FF
gText_BattlePyramidFloor:: @ 85EE716 gText_BattlePyramidFloor:: @ 85EE716
.string "Battle Pyramid\n{STR_VAR_1}$" .string "Battle Pyramid\n{STR_VAR_1}$"
gUnknown_085EE728:: @ 85EE728 gText_Floor1:: @ 85EE728
.string "Floor 1$" .string "Floor 1$"
gUnknown_085EE730:: @ 85EE730 gText_Floor2:: @ 85EE730
.string "Floor 2$" .string "Floor 2$"
gUnknown_085EE738:: @ 85EE738 gText_Floor3:: @ 85EE738
.string "Floor 3$" .string "Floor 3$"
gUnknown_085EE740:: @ 85EE740 gText_Floor4:: @ 85EE740
.string "Floor 4$" .string "Floor 4$"
gUnknown_085EE748:: @ 85EE748 gText_Floor5:: @ 85EE748
.string "Floor 5$" .string "Floor 5$"
gUnknown_085EE750:: @ 85EE750 gText_Floor6:: @ 85EE750
.string "Floor 6$" .string "Floor 6$"
gUnknown_085EE758:: @ 85EE758 gText_Floor7:: @ 85EE758
.string "Floor 7$" .string "Floor 7$"
gUnknown_085EE760:: @ 85EE760 gText_Peak:: @ 85EE760
.string "Peak$" .string "Peak$"
gText_LinkStandby2:: @ 85EE765 gText_LinkStandby2:: @ 85EE765
@@ -5393,4 +5393,3 @@ gText_Berry:: @ 85EFCDF
gText_Berries:: @ 85EFCE5 gText_Berries:: @ 85EFCE5
.string "BERRIES$" .string "BERRIES$"
data/text_window.s
+161 -8
View File
@@ -1,17 +1,170 @@
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_0850E87C:: @ 850E87C 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 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 gUnknown_0851017C:: @ 851017C
.incbin "baserom.gba", 0x51017c, 0xa0 .incbin "baserom.gba", 0x51017c, 0xA0
gUnknown_0851021C:: @ 851021C 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
+5 -5
View File
@@ -1,9 +1,9 @@
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
.align 2, 0
gUnknown_0832C6A8:: @ 832C6A8 gUnknown_0832C6A8:: @ 832C6A8
.incbin "baserom.gba", 0x32C6A8, 0x18 .incbin "baserom.gba", 0x32C6A8, 0x18
data/trainer_card.s
+169 -21
View File
@@ -1,11 +1,44 @@
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0 .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 gUnknown_0856F018:: @ 856F018
.incbin "baserom.gba", 0x56f018, 0x494 .incbin "baserom.gba", 0x56f018, 0x194
gUnknown_0856F1AC:: @ 856F1AC
.incbin "baserom.gba", 0x56f1ac, 0x60
gUnknown_0856F20C:: @ 856F20C
.incbin "baserom.gba", 0x56f20c, 0x60
gUnknown_0856F26C:: @ 856F26C
.incbin "baserom.gba", 0x56f26c, 0x60
gUnknown_0856F2CC:: @ 856F2CC
.incbin "baserom.gba", 0x56f2cc, 0x60
gUnknown_0856F32C:: @ 856F32C
.incbin "baserom.gba", 0x56f32c, 0x60
gUnknown_0856F38C:: @ 856F38C
.incbin "baserom.gba", 0x56f38c, 0x60
gUnknown_0856F3EC:: @ 856F3EC
.incbin "baserom.gba", 0x56f3ec, 0x60
gUnknown_0856F44C:: @ 856F44C
.incbin "baserom.gba", 0x56f44c, 0x60
gUnknown_0856F4AC:: @ 856F4AC gUnknown_0856F4AC:: @ 856F4AC
.incbin "baserom.gba", 0x56f4ac, 0x20 .incbin "baserom.gba", 0x56f4ac, 0x20
@@ -47,16 +80,27 @@ gUnknown_0856FAC4:: @ 856FAC4
.incbin "baserom.gba", 0x56fac4, 0x20 .incbin "baserom.gba", 0x56fac4, 0x20
gUnknown_0856FAE4:: @ 856FAE4 gUnknown_0856FAE4:: @ 856FAE4
.incbin "baserom.gba", 0x56fae4, 0x14 .4byte gUnknown_08DD1A58
.4byte gUnknown_0856F1AC
.4byte gUnknown_0856F26C
.4byte gUnknown_0856F32C
.4byte gUnknown_0856F3EC
gUnknown_0856FAF8:: @ 856FAF8 gUnknown_0856FAF8:: @ 856FAF8
.incbin "baserom.gba", 0x56faf8, 0x14 .4byte gUnknown_08DD240C
.4byte gUnknown_0856F20C
.4byte gUnknown_0856F2CC
.4byte gUnknown_0856F38C
.4byte gUnknown_0856F44C
gUnknown_0856FB0C:: @ 856FB0C gUnknown_0856FB0C:: @ 856FB0C
.incbin "baserom.gba", 0x56fb0c, 0x3 .incbin "baserom.gba", 0x56fb0c, 0x3
gUnknown_0856FB0F:: @ 856FB0F gUnknown_0856FB0F:: @ 856FB0F
.incbin "baserom.gba", 0x56fb0f, 0x9 .incbin "baserom.gba", 0x56fb0f, 0x3
gUnknown_0856FB12:: @ 856FB12
.incbin "baserom.gba", 0x56fb12, 0x6
gUnknown_0856FB18:: @ 856FB18 gUnknown_0856FB18:: @ 856FB18
.incbin "baserom.gba", 0x56fb18, 0x8 .incbin "baserom.gba", 0x56fb18, 0x8
@@ -65,10 +109,16 @@ gUnknown_0856FB20:: @ 856FB20
.incbin "baserom.gba", 0x56fb20, 0x8 .incbin "baserom.gba", 0x56fb20, 0x8
gUnknown_0856FB28:: @ 856FB28 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 gUnknown_0856FB40:: @ 856FB40
.incbin "baserom.gba", 0x56fb40, 0x8 .4byte gUnknown_0856FB0C
.4byte gUnknown_0856FB12
gUnknown_0856FB48:: @ 856FB48 gUnknown_0856FB48:: @ 856FB48
.incbin "baserom.gba", 0x56fb48, 0x2 .incbin "baserom.gba", 0x56fb48, 0x2
@@ -86,7 +136,9 @@ gUnknown_0856FB57:: @ 856FB57
.incbin "baserom.gba", 0x56fb57, 0x5 .incbin "baserom.gba", 0x56fb57, 0x5
gUnknown_0856FB5C:: @ 856FB5C gUnknown_0856FB5C:: @ 856FB5C
.incbin "baserom.gba", 0x56fb5c, 0xc .4byte gText_LinkBattles
.4byte gText_LinkCableBattles
.4byte gText_LinkBattles
gUnknown_0856FB68:: @ 856FB68 gUnknown_0856FB68:: @ 856FB68
.incbin "baserom.gba", 0x56fb68, 0x6 .incbin "baserom.gba", 0x56fb68, 0x6
@@ -98,10 +150,25 @@ gUnknown_0856FB74:: @ 856FB74
.incbin "baserom.gba", 0x56fb74, 0x4 .incbin "baserom.gba", 0x56fb74, 0x4
gUnknown_0856FB78:: @ 856FB78 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 gUnknown_0856FBBC:: @ 856FBBC
.incbin "baserom.gba", 0x56fbbc, 0x1244 .incbin "baserom.gba", 0x56fbbc, 0xFEC
gUnknown_08570BA8:: @ 8570BA8
.incbin "baserom.gba", 0x570ba8, 0x9C
gUnknown_08570C44:: @ 8570C44
.incbin "baserom.gba", 0x570c44, 0xBC
gUnknown_08570D00:: @ 8570D00
.incbin "baserom.gba", 0x570d00, 0x100
gUnknown_08570E00:: @ 8570E00 gUnknown_08570E00:: @ 8570E00
.incbin "baserom.gba", 0x570e00, 0x260 .incbin "baserom.gba", 0x570e00, 0x260
@@ -143,25 +210,106 @@ gUnknown_08571454:: @ 8571454
.incbin "baserom.gba", 0x571454, 0x68 .incbin "baserom.gba", 0x571454, 0x68
gUnknown_085714BC:: @ 85714BC gUnknown_085714BC:: @ 85714BC
.incbin "baserom.gba", 0x5714bc, 0x18 obj_tiles gUnknown_08570BA8, 0x100, 0
obj_tiles gUnknown_08570D00, 0x400, 1
obj_tiles gUnknown_08DC1394, 0x380, 2
gUnknown_085714D4:: @ 85714D4 gUnknown_085714D4:: @ 85714D4
.incbin "baserom.gba", 0x5714d4, 0x10 obj_tiles gUnknown_08570C44, 0x100, 4
obj_tiles NULL, 0, 0
gUnknown_085714E4:: @ 85714E4 gUnknown_085714E4:: @ 85714E4
.incbin "baserom.gba", 0x5714e4, 0xd0 obj_pal gUnknown_08DC1674, 0
obj_pal gUnknown_08DC1694, 1
obj_pal gUnknown_08DC16B4, 2
obj_pal gUnknown_08DC16D4, 3
obj_pal gUnknown_0856FB7C, 4
obj_pal gUnknown_0856FB9C, 5
obj_pal NULL, 0
obj_pal NULL, 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 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 gUnknown_085715E4:: @ 85715E4
.incbin "baserom.gba", 0x5715e4, 0x18 spr_template 2, 2, gUnknown_0852490C, gUnknown_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085715FC:: @ 85715FC gUnknown_085715FC:: @ 85715FC
.incbin "baserom.gba", 0x5715fc, 0x18 spr_template 4, 4, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39
gUnknown_08571614:: @ 8571614 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 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. @ This is a factor in how much money you get for beating a trainer.
.align 2 .align 2
gTrainerMoneyTable:: @ 831AEB8 gTrainerMoneyTable:: @ 831AEB8
.byte TRAINER_CLASS_NAME_TEAM_AQUA, 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_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0 .byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0 .byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0
.byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0 .byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0 .byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0
.byte TRAINER_CLASS_NAME_TUBER_1, 1, 0, 0 .byte TRAINER_CLASS_NAME_TUBER_1, 1, 0, 0
.byte TRAINER_CLASS_NAME_TUBER_2, 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_SIS_AND_BRO, 3, 0, 0
.byte TRAINER_CLASS_NAME_COOLTRAINER_1, 12, 0, 0 .byte TRAINER_CLASS_NAME_COOLTRAINER_1, 12, 0, 0
.byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0 .byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0
.byte TRAINER_CLASS_NAME_LADY, 50, 0, 0 .byte TRAINER_CLASS_NAME_LADY, 50, 0, 0
.byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0 .byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0
.byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0 .byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0
.byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0 .byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0 .byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0
.byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0 .byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0
.byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0 .byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0
.byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0 .byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0
.byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0 .byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0
.byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0 .byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0
.byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0 .byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0
.byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0 .byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0
.byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0 .byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0
.byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0 .byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0
.byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0 .byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0
.byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 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_SR_AND_JR, 4, 0, 0
.byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0 .byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0
.byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0 .byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0
.byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0 .byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0
.byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0 .byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0
.byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0 .byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0
.byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0 .byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0
.byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0 .byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0
.byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0 .byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0
.byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0 .byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0
.byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0 .byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0
.byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0 .byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0
.byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0 .byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0
.byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0 .byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0
.byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0 .byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0
.byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0 .byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0
.byte TRAINER_CLASS_NAME_COLLECTOR, 15, 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_TRAINER_3, 15, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_BREEDER, 10, 0, 0 .byte TRAINER_CLASS_NAME_PKMN_BREEDER, 10, 0, 0
.byte TRAINER_CLASS_NAME_PKMN_RANGER, 12, 0, 0 .byte TRAINER_CLASS_NAME_PKMN_RANGER, 12, 0, 0
.byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 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_ADMIN, 10, 0, 0
.byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0 .byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0
.byte TRAINER_CLASS_NAME_LASS, 4, 0, 0 .byte TRAINER_CLASS_NAME_LASS, 4, 0, 0
.byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0 .byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0
.byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0 .byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0
.byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0 .byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0
.byte TRAINER_CLASS_LEADER_1, 10, 0, 0 .byte TRAINER_CLASS_LEADER_1, 10, 0, 0
.byte -1, 5, 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 @ format: attacking type, defending type, damage multiplier
@ the multiplier is a (decimal) fixed-point number: @ the multiplier is a (decimal) fixed-point number:
@ 20 is ×2.0 @ 20 is ×2.0
@ 05 is ×0.5 @ 05 is ×0.5
@ 00 is ×0 @ 00 is ×0
gTypeEffectiveness:: @ 831ACE8 gTypeEffectiveness:: @ 831ACE8
.byte TYPE_NORMAL, TYPE_ROCK, 5 .byte TYPE_NORMAL, TYPE_ROCK, 5
.byte TYPE_NORMAL, TYPE_STEEL, 5 .byte TYPE_NORMAL, TYPE_STEEL, 5
.byte TYPE_FIRE, TYPE_FIRE, 5 .byte TYPE_FIRE, TYPE_FIRE, 5
.byte TYPE_FIRE, TYPE_WATER, 5 .byte TYPE_FIRE, TYPE_WATER, 5
.byte TYPE_FIRE, TYPE_GRASS, 20 .byte TYPE_FIRE, TYPE_GRASS, 20
.byte TYPE_FIRE, TYPE_ICE, 20 .byte TYPE_FIRE, TYPE_ICE, 20
.byte TYPE_FIRE, TYPE_BUG, 20 .byte TYPE_FIRE, TYPE_BUG, 20
.byte TYPE_FIRE, TYPE_ROCK, 5 .byte TYPE_FIRE, TYPE_ROCK, 5
.byte TYPE_FIRE, TYPE_DRAGON, 5 .byte TYPE_FIRE, TYPE_DRAGON, 5
.byte TYPE_FIRE, TYPE_STEEL, 20 .byte TYPE_FIRE, TYPE_STEEL, 20
.byte TYPE_WATER, TYPE_FIRE, 20 .byte TYPE_WATER, TYPE_FIRE, 20
.byte TYPE_WATER, TYPE_WATER, 5 .byte TYPE_WATER, TYPE_WATER, 5
.byte TYPE_WATER, TYPE_GRASS, 5 .byte TYPE_WATER, TYPE_GRASS, 5
.byte TYPE_WATER, TYPE_GROUND, 20 .byte TYPE_WATER, TYPE_GROUND, 20
.byte TYPE_WATER, TYPE_ROCK, 20 .byte TYPE_WATER, TYPE_ROCK, 20
.byte TYPE_WATER, TYPE_DRAGON, 5 .byte TYPE_WATER, TYPE_DRAGON, 5
.byte TYPE_ELECTRIC, TYPE_WATER, 20 .byte TYPE_ELECTRIC, TYPE_WATER, 20
.byte TYPE_ELECTRIC, TYPE_ELECTRIC, 5 .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_GROUND, 0
.byte TYPE_ELECTRIC, TYPE_FLYING, 20 .byte TYPE_ELECTRIC, TYPE_FLYING, 20
.byte TYPE_ELECTRIC, TYPE_DRAGON, 5 .byte TYPE_ELECTRIC, TYPE_DRAGON, 5
.byte TYPE_GRASS, TYPE_FIRE, 5 .byte TYPE_GRASS, TYPE_FIRE, 5
.byte TYPE_GRASS, TYPE_WATER, 20 .byte TYPE_GRASS, TYPE_WATER, 20
.byte TYPE_GRASS, TYPE_GRASS, 5 .byte TYPE_GRASS, TYPE_GRASS, 5
.byte TYPE_GRASS, TYPE_POISON, 5 .byte TYPE_GRASS, TYPE_POISON, 5
.byte TYPE_GRASS, TYPE_GROUND, 20 .byte TYPE_GRASS, TYPE_GROUND, 20
.byte TYPE_GRASS, TYPE_FLYING, 5 .byte TYPE_GRASS, TYPE_FLYING, 5
.byte TYPE_GRASS, TYPE_BUG, 5 .byte TYPE_GRASS, TYPE_BUG, 5
.byte TYPE_GRASS, TYPE_ROCK, 20 .byte TYPE_GRASS, TYPE_ROCK, 20
.byte TYPE_GRASS, TYPE_DRAGON, 5 .byte TYPE_GRASS, TYPE_DRAGON, 5
.byte TYPE_GRASS, TYPE_STEEL, 5 .byte TYPE_GRASS, TYPE_STEEL, 5
.byte TYPE_ICE, TYPE_WATER, 5 .byte TYPE_ICE, TYPE_WATER, 5
.byte TYPE_ICE, TYPE_GRASS, 20 .byte TYPE_ICE, TYPE_GRASS, 20
.byte TYPE_ICE, TYPE_ICE, 5 .byte TYPE_ICE, TYPE_ICE, 5
.byte TYPE_ICE, TYPE_GROUND, 20 .byte TYPE_ICE, TYPE_GROUND, 20
.byte TYPE_ICE, TYPE_FLYING, 20 .byte TYPE_ICE, TYPE_FLYING, 20
.byte TYPE_ICE, TYPE_DRAGON, 20 .byte TYPE_ICE, TYPE_DRAGON, 20
.byte TYPE_ICE, TYPE_STEEL, 5 .byte TYPE_ICE, TYPE_STEEL, 5
.byte TYPE_ICE, TYPE_FIRE, 5 .byte TYPE_ICE, TYPE_FIRE, 5
.byte TYPE_FIGHTING, TYPE_NORMAL, 20 .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_POISON, 5
.byte TYPE_FIGHTING, TYPE_FLYING, 5 .byte TYPE_FIGHTING, TYPE_FLYING, 5
.byte TYPE_FIGHTING, TYPE_PSYCHIC, 5 .byte TYPE_FIGHTING, TYPE_PSYCHIC, 5
.byte TYPE_FIGHTING, TYPE_BUG, 5 .byte TYPE_FIGHTING, TYPE_BUG, 5
.byte TYPE_FIGHTING, TYPE_ROCK, 20 .byte TYPE_FIGHTING, TYPE_ROCK, 20
.byte TYPE_FIGHTING, TYPE_DARK, 20 .byte TYPE_FIGHTING, TYPE_DARK, 20
.byte TYPE_FIGHTING, TYPE_STEEL, 20 .byte TYPE_FIGHTING, TYPE_STEEL, 20
.byte TYPE_POISON, TYPE_GRASS, 20 .byte TYPE_POISON, TYPE_GRASS, 20
.byte TYPE_POISON, TYPE_POISON, 5 .byte TYPE_POISON, TYPE_POISON, 5
.byte TYPE_POISON, TYPE_GROUND, 5 .byte TYPE_POISON, TYPE_GROUND, 5
.byte TYPE_POISON, TYPE_ROCK, 5 .byte TYPE_POISON, TYPE_ROCK, 5
.byte TYPE_POISON, TYPE_GHOST, 5 .byte TYPE_POISON, TYPE_GHOST, 5
.byte TYPE_POISON, TYPE_STEEL, 0 .byte TYPE_POISON, TYPE_STEEL, 0
.byte TYPE_GROUND, TYPE_FIRE, 20 .byte TYPE_GROUND, TYPE_FIRE, 20
.byte TYPE_GROUND, TYPE_ELECTRIC, 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_POISON, 20
.byte TYPE_GROUND, TYPE_FLYING, 0 .byte TYPE_GROUND, TYPE_FLYING, 0
.byte TYPE_GROUND, TYPE_BUG, 5 .byte TYPE_GROUND, TYPE_BUG, 5
.byte TYPE_GROUND, TYPE_ROCK, 20 .byte TYPE_GROUND, TYPE_ROCK, 20
.byte TYPE_GROUND, TYPE_STEEL, 20 .byte TYPE_GROUND, TYPE_STEEL, 20
.byte TYPE_FLYING, TYPE_ELECTRIC, 5 .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_FIGHTING, 20
.byte TYPE_FLYING, TYPE_BUG, 20 .byte TYPE_FLYING, TYPE_BUG, 20
.byte TYPE_FLYING, TYPE_ROCK, 5 .byte TYPE_FLYING, TYPE_ROCK, 5
.byte TYPE_FLYING, TYPE_STEEL, 5 .byte TYPE_FLYING, TYPE_STEEL, 5
.byte TYPE_PSYCHIC, TYPE_FIGHTING, 20 .byte TYPE_PSYCHIC, TYPE_FIGHTING, 20
.byte TYPE_PSYCHIC, TYPE_POISON, 20 .byte TYPE_PSYCHIC, TYPE_POISON, 20
.byte TYPE_PSYCHIC, TYPE_PSYCHIC, 5 .byte TYPE_PSYCHIC, TYPE_PSYCHIC, 5
.byte TYPE_PSYCHIC, TYPE_DARK, 0 .byte TYPE_PSYCHIC, TYPE_DARK, 0
.byte TYPE_PSYCHIC, TYPE_STEEL, 5 .byte TYPE_PSYCHIC, TYPE_STEEL, 5
.byte TYPE_BUG, TYPE_FIRE, 5 .byte TYPE_BUG, TYPE_FIRE, 5
.byte TYPE_BUG, TYPE_GRASS, 20 .byte TYPE_BUG, TYPE_GRASS, 20
.byte TYPE_BUG, TYPE_FIGHTING, 5 .byte TYPE_BUG, TYPE_FIGHTING, 5
.byte TYPE_BUG, TYPE_POISON, 5 .byte TYPE_BUG, TYPE_POISON, 5
.byte TYPE_BUG, TYPE_FLYING, 5 .byte TYPE_BUG, TYPE_FLYING, 5
.byte TYPE_BUG, TYPE_PSYCHIC, 20 .byte TYPE_BUG, TYPE_PSYCHIC, 20
.byte TYPE_BUG, TYPE_GHOST, 5 .byte TYPE_BUG, TYPE_GHOST, 5
.byte TYPE_BUG, TYPE_DARK, 20 .byte TYPE_BUG, TYPE_DARK, 20
.byte TYPE_BUG, TYPE_STEEL, 5 .byte TYPE_BUG, TYPE_STEEL, 5
.byte TYPE_ROCK, TYPE_FIRE, 20 .byte TYPE_ROCK, TYPE_FIRE, 20
.byte TYPE_ROCK, TYPE_ICE, 20 .byte TYPE_ROCK, TYPE_ICE, 20
.byte TYPE_ROCK, TYPE_FIGHTING, 5 .byte TYPE_ROCK, TYPE_FIGHTING, 5
.byte TYPE_ROCK, TYPE_GROUND, 5 .byte TYPE_ROCK, TYPE_GROUND, 5
.byte TYPE_ROCK, TYPE_FLYING, 20 .byte TYPE_ROCK, TYPE_FLYING, 20
.byte TYPE_ROCK, TYPE_BUG, 20 .byte TYPE_ROCK, TYPE_BUG, 20
.byte TYPE_ROCK, TYPE_STEEL, 5 .byte TYPE_ROCK, TYPE_STEEL, 5
.byte TYPE_GHOST, TYPE_NORMAL, 0 .byte TYPE_GHOST, TYPE_NORMAL, 0
.byte TYPE_GHOST, TYPE_PSYCHIC, 20 .byte TYPE_GHOST, TYPE_PSYCHIC, 20
.byte TYPE_GHOST, TYPE_DARK, 5 .byte TYPE_GHOST, TYPE_DARK, 5
.byte TYPE_GHOST, TYPE_STEEL, 5 .byte TYPE_GHOST, TYPE_STEEL, 5
.byte TYPE_GHOST, TYPE_GHOST, 20 .byte TYPE_GHOST, TYPE_GHOST, 20
.byte TYPE_DRAGON, TYPE_DRAGON, 20 .byte TYPE_DRAGON, TYPE_DRAGON, 20
.byte TYPE_DRAGON, TYPE_STEEL, 5 .byte TYPE_DRAGON, TYPE_STEEL, 5
.byte TYPE_DARK, TYPE_FIGHTING, 5 .byte TYPE_DARK, TYPE_FIGHTING, 5
.byte TYPE_DARK, TYPE_PSYCHIC, 20 .byte TYPE_DARK, TYPE_PSYCHIC, 20
.byte TYPE_DARK, TYPE_GHOST, 20 .byte TYPE_DARK, TYPE_GHOST, 20
.byte TYPE_DARK, TYPE_DARK, 5 .byte TYPE_DARK, TYPE_DARK, 5
.byte TYPE_DARK, TYPE_STEEL, 5 .byte TYPE_DARK, TYPE_STEEL, 5
.byte TYPE_STEEL, TYPE_FIRE, 5 .byte TYPE_STEEL, TYPE_FIRE, 5
.byte TYPE_STEEL, TYPE_WATER, 5 .byte TYPE_STEEL, TYPE_WATER, 5
.byte TYPE_STEEL, TYPE_ELECTRIC, 5 .byte TYPE_STEEL, TYPE_ELECTRIC, 5
.byte TYPE_STEEL, TYPE_ICE, 20 .byte TYPE_STEEL, TYPE_ICE, 20
.byte TYPE_STEEL, TYPE_ROCK, 20 .byte TYPE_STEEL, TYPE_ROCK, 20
.byte TYPE_STEEL, TYPE_STEEL, 5 .byte TYPE_STEEL, TYPE_STEEL, 5
.byte 0xFE, 0xFE, 0 .byte 0xFE, 0xFE, 0
.byte TYPE_NORMAL, TYPE_GHOST, 0 .byte TYPE_NORMAL, TYPE_GHOST, 0
.byte TYPE_FIGHTING, TYPE_GHOST, 0 .byte TYPE_FIGHTING, TYPE_GHOST, 0
.byte 0xFF, 0xFF, 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 .incbin "baserom.gba", 0x62ad54, 0x1dc
gUnknown_0862AF30:: @ 862AF30 gUnknown_0862AF30:: @ 862AF30
.incbin "baserom.gba", 0x62af30, 0x60c .incbin "baserom.gba", 0x62af30, 0x1AC
gUnknown_0862B0DC:: @ 862B0DC
.incbin "baserom.gba", 0x62b0dc, 0x460
gUnknown_0862B53C:: @ 862B53C gUnknown_0862B53C:: @ 862B53C
.incbin "baserom.gba", 0x62b53c, 0x1e8 .incbin "baserom.gba", 0x62b53c, 0x1E0
gUnknown_0862B71C:: @ 862B71C
.incbin "baserom.gba", 0x62b71c, 0x8
gUnknown_0862B724:: @ 862B724 gUnknown_0862B724:: @ 862B724
.incbin "baserom.gba", 0x62b724, 0x8 obj_tiles gUnknown_0862B0DC, 0x1800, 11920
gUnknown_0862B72C:: @ 862B72C 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 gUnknown_0862B758:: @ 862B758
.incbin "baserom.gba", 0x62b758, 0x18 spr_template 11920, 11920, gUnknown_0862B71C, gUnknown_0862B74C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/use_pokeblock.s
+5 -4
View File
@@ -2,7 +2,7 @@
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
gUnknown_085DFA60:: @ 85DFA60 gUnknown_085DFA60:: @ 85DFA60
.incbin "baserom.gba", 0x5dfa60, 0x20 .incbin "baserom.gba", 0x5dfa60, 0x20
@@ -47,10 +47,10 @@ sContestStatNames:: @ 85DFD04
.4byte gText_Beauty3 .4byte gText_Beauty3
gUnknown_085DFD18:: @ 85DFD18 gUnknown_085DFD18:: @ 85DFD18
.incbin "baserom.gba", 0x5dfd18, 0x8 obj_tiles gUnknown_08DCCD5C, 0x200, 0
gUnknown_085DFD20:: @ 85DFD20 gUnknown_085DFD20:: @ 85DFD20
.incbin "baserom.gba", 0x5dfd20, 0x8 obj_pal gUnknown_08DCCD3C, 0
gUnknown_085DFD28:: @ 85DFD28 gUnknown_085DFD28:: @ 85DFD28
.incbin "baserom.gba", 0x5dfd28, 0x34 .incbin "baserom.gba", 0x5dfd28, 0x34
@@ -62,4 +62,5 @@ gUnknown_085DFDA0:: @ 85DFDA0
.incbin "baserom.gba", 0x5dfda0, 0x18 .incbin "baserom.gba", 0x5dfda0, 0x18
gUnknown_085DFDB8:: @ 85DFDB8 gUnknown_085DFDB8:: @ 85DFDB8
.incbin "baserom.gba", 0x5dfdb8, 0x8 .4byte gUnknown_08DCCB98
.4byte 1
data/wild_encounter.s
+4 -4
View File
@@ -1,9 +1,9 @@
#include "constants/species.h" #include "constants/species.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
@ 85507E4 @ 85507E4
.include "data/wild_mons.inc" .include "data/wild_mons.inc"
graphics/unknown/unknown_5B3544.pal
-19
View File
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
115 197 164
74 74 74
189 131 156
230 156 213
222 238 255
230 246 255
148 115 139
197 213 222
172 164 189
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
include/bike.h
+78
View File
@@ -0,0 +1,78 @@
#ifndef GUARD_BIKE_H
#define GUARD_BIKE_H
// the struct below is used for checking button combinations of the last input so that the acro can potentially perform a side/turn jump.
// its possible that at some point Game Freak intended for the acro bike to have more complex tricks: but only the acro jump combinations can be seen in the final ROM.
struct BikeHistoryInputInfo
{
u32 dirHistoryMatch; // the direction you need to press
u32 abStartSelectHistoryMatch; // the button you need to press
u32 dirHistoryMask; // mask applied so that way only the recent nybble (the recent input) is checked
u32 abStartSelectHistoryMask; // mask applied so that way only the recent nybble (the recent input) is checked
const u8 *dirTimerHistoryList; // list of timers to check for direction before the button+dir combination can be verified.
const u8 *abStartSelectHistoryList; // list of timers to check for buttons before the button+dir combination can be verified.
u32 direction; // direction to jump
};
// Player speeds
enum
{
SPEED_STANDING,
SPEED_NORMAL,
SPEED_FAST,
SPEED_FASTER,
SPEED_FASTEST,
};
// mach bike transitions enum
enum
{
MACH_TRANS_FACE_DIRECTION,
MACH_TRANS_TURN_DIRECTION,
MACH_TRANS_KEEP_MOVING,
MACH_TRANS_START_MOVING
};
// Acro bike states
enum
{
ACRO_STATE_NORMAL,
ACRO_STATE_TURNING,
ACRO_STATE_WHEELIE_STANDING,
ACRO_STATE_BUNNY_HOP,
ACRO_STATE_WHEELIE_MOVING,
ACRO_STATE_SIDE_JUMP,
ACRO_STATE_TURN_JUMP,
};
// Acro bike transitions
enum
{
ACRO_TRANS_FACE_DIRECTION,
ACRO_TRANS_TURN_DIRECTION,
ACRO_TRANS_MOVING,
ACRO_TRANS_NORMAL_TO_WHEELIE,
ACRO_TRANS_WHEELIE_TO_NORMAL,
ACRO_TRANS_WHEELIE_IDLE,
ACRO_TRANS_WHEELIE_HOPPING_STANDING,
ACRO_TRANS_WHEELIE_HOPPING_MOVING,
ACRO_TRANS_SIDE_JUMP,
ACRO_TRANS_TURN_JUMP,
ACRO_TRANS_WHEELIE_MOVING,
ACRO_TRANS_WHEELIE_RISING_MOVING,
ACRO_TRANS_WHEELIE_LOWERING_MOVING,
};
void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys);
void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys);
bool8 RS_IsRunningDisallowed(u8 tile);
bool8 IsBikingDisallowedByPlayer(void);
bool8 player_should_look_direction_be_enforced_upon_movement(void);
void GetOnOffBike(u8 transitionFlags);
void BikeClearState(int newDirHistory, int newAbStartHistory);
void Bike_UpdateBikeCounterSpeed(u8 counter);
s16 GetPlayerSpeed(void);
void Bike_HandleBumpySlopeJump(void);
bool32 IsRunningDisallowed(u8 metatile);
#endif // GUARD_BIKE_H
include/data/pokedex_orders.h
+1199
View File
File diff suppressed because it is too large Load Diff
include/field_player_avatar.h
+21
View File
@@ -9,6 +9,27 @@ void PlayerGetDestCoords(s16 *, s16 *);
u8 player_get_direction_lower_nybble(void); u8 player_get_direction_lower_nybble(void);
u8 player_get_direction_upper_nybble(void); u8 player_get_direction_upper_nybble(void);
u8 player_get_x22(void); u8 player_get_x22(void);
void PlayerGoSpeed1(u8);
void PlayerGoSpeed2(u8);
void PlayerGoSpeed3(u8);
void PlayerGoSpeed4(u8);
void PlayerOnBikeCollide(u8);
void PlayerFaceDirection(u8 a);
void PlayerTurnInPlace(u8 a);
void PlayerJumpLedge(u8 a);
void PlayerIdleWheelie(u8 a);
void PlayerStartWheelie(u8 a);
void PlayerEndWheelie(u8 a);
void PlayerStandingHoppingWheelie(u8 a);
void PlayerMovingHoppingWheelie(u8 a);
void PlayerLedgeHoppingWheelie(u8 a);
void PlayerAcroTurnJump(u8 a);
void PlayerSetAnimId(u8 a, u8 b);
bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction);
void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction);
u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e);
u8 PlayerGetZCoord(void);
void SetPlayerAvatarTransitionFlags(u16 a);
void sub_808BCE8(void); void sub_808BCE8(void);
void sub_808D074(u8); void sub_808D074(u8);
include/global.fieldmap.h
+31 -14
View File
@@ -299,25 +299,42 @@ enum
COLLISION_LEDGE_JUMP = 6 COLLISION_LEDGE_JUMP = 6
}; };
struct PlayerAvatar /* 0x202E858 */ // player running states
enum
{
NOT_MOVING,
TURN_DIRECTION, // not the same as turning! turns your avatar without moving. also known as a turn frame in some circles
MOVING,
};
// player tile transition states
enum
{
T_NOT_MOVING,
T_TILE_TRANSITION,
T_TILE_CENTER, // player is on a frame in which they are centered on a tile during which the player either stops or keeps their momentum and keeps going, changing direction if necessary.
};
struct PlayerAvatar
{ {
/*0x00*/ u8 flags; /*0x00*/ u8 flags;
/*0x01*/ u8 bike; /*0x01*/ u8 unk1; // used to be named bike, but its definitely not that. seems to be some transition flags
/*0x02*/ u8 running2; /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
/*0x03*/ u8 running1; /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
/*0x04*/ u8 spriteId; /*0x04*/ u8 spriteId;
/*0x05*/ u8 mapObjectId; /*0x05*/ u8 mapObjectId;
/*0x06*/ u8 unk6; /*0x06*/ bool8 preventStep;
/*0x07*/ u8 gender; /*0x07*/ u8 gender;
u8 acroBikeState; /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie
u8 unk9; /*0x09*/ u8 newDirBackup; // during bike movement, the new direction as opposed to player's direction is backed up here.
u8 bikeFrameCounter; /*0x0A*/ u8 bikeFrameCounter; // on the mach bike, when this value is 1, the bike is moving but not accelerating yet for 1 tile. on the acro bike, this acts as a timer for acro bike.
u8 unkB; /*0x0B*/ u8 bikeSpeed;
u32 unkC; // acro bike only
u32 unk10; /*0x0C*/ u32 directionHistory; // up/down/left/right history is stored in each nybble, but using the field directions and not the io inputs.
u8 unk14[8]; /*0x10*/ u32 abStartSelectHistory; // same as above but for A + B + start + select only
u8 unk1C[8]; // these two are timer history arrays which [0] is the active timer for acro bike. every element is backed up to the next element upon update.
// TODO: rest of struct /*0x14*/ u8 dirTimerHistory[8];
/*0x1C*/ u8 abStartSelectTimerHistory[8];
}; };
struct Camera struct Camera
include/graphics.h
+2437
View File
File diff suppressed because it is too large Load Diff
include/sprite.h
-4
View File
@@ -120,10 +120,6 @@ union AffineAnimCmd
{.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}} {.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}}
#define AFFINEANIMCMD_END \ #define AFFINEANIMCMD_END \
{.type = AFFINEANIMCMDTYPE_END} {.type = AFFINEANIMCMDTYPE_END}
#define AFFINEANIMCMD_LOOP(_count) \
{.loop = {.type = AFFINEANIMCMDTYPE_LOOP, .count = _count}}
#define AFFINEANIMCMD_JUMP(_target) \
{.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}}
struct AffineAnimState struct AffineAnimState
{ {
include/strings.h
+33
View File
@@ -137,4 +137,37 @@ extern const u8 gMenuText_Give2[];
extern const u8 gText_Cancel2[]; extern const u8 gText_Cancel2[];
extern const u8 gText_WithdrawPokemon[];
extern const u8 gText_WithdrawMonDescription[];
extern const u8 gText_DepositPokemon[];
extern const u8 gText_DepositMonDescription[];
extern const u8 gText_MovePokemon[];
extern const u8 gText_MoveMonDescription[];
extern const u8 gText_MoveItems[];
extern const u8 gText_MoveItemsDescription[];
extern const u8 gText_SeeYa[];
extern const u8 gText_SeeYaDescription[];
// menu texts
extern const u8 gText_MenuPokedex[];
extern const u8 gText_MenuPokemon[];
extern const u8 gText_MenuBag[];
extern const u8 gText_MenuPokenav[];
extern const u8 gText_MenuPlayer[];
extern const u8 gText_MenuSave[];
extern const u8 gText_MenuOption[];
extern const u8 gText_MenuExit[];
extern const u8 gText_MenuRetire[];
extern const u8 gText_MenuRest[];
extern const u8 gText_Floor1[];
extern const u8 gText_Floor2[];
extern const u8 gText_Floor3[];
extern const u8 gText_Floor4[];
extern const u8 gText_Floor5[];
extern const u8 gText_Floor6[];
extern const u8 gText_Floor7[];
extern const u8 gText_Peak[];
extern const u8 gText_SafariBallStock[];
extern const u8 gText_BattlePyramidFloor[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H
ld_script.txt
+10 -5
View File
@@ -127,10 +127,12 @@ SECTIONS {
asm/field_effect.o(.text); asm/field_effect.o(.text);
asm/unknown_task.o(.text); asm/unknown_task.o(.text);
asm/option_menu.o(.text); asm/option_menu.o(.text);
src/pokedex.o(.text);
asm/pokedex.o(.text); asm/pokedex.o(.text);
asm/trainer_card.o(.text); asm/trainer_card.o(.text);
src/pokemon_storage_system.o(.text); src/pokemon_storage_system.o(.text);
asm/pokemon_storage_system.o(.text); asm/pokemon_storage_system.o(.text);
src/pokemon_icon.o(.text);
asm/pokemon_icon.o(.text); asm/pokemon_icon.o(.text);
asm/script_movement.o(.text); asm/script_movement.o(.text);
asm/fldeff_cut.o(.text); asm/fldeff_cut.o(.text);
@@ -161,7 +163,7 @@ SECTIONS {
asm/contest_link_80FC4F4.o(.text); asm/contest_link_80FC4F4.o(.text);
asm/item_use.o(.text); asm/item_use.o(.text);
asm/battle_anim_80FE840.o(.text); asm/battle_anim_80FE840.o(.text);
asm/bike.o(.text); src/bike.o(.text);
asm/easy_chat.o(.text); asm/easy_chat.o(.text);
asm/mon_markings.o(.text); asm/mon_markings.o(.text);
asm/mauville_old_man.o(.text); asm/mauville_old_man.o(.text);
@@ -265,6 +267,7 @@ SECTIONS {
src/pokemon_summary_screen.o(.text); src/pokemon_summary_screen.o(.text);
asm/pokemon_summary_screen.o(.text); asm/pokemon_summary_screen.o(.text);
asm/pokenav.o(.text); asm/pokenav.o(.text);
src/rayquaza_scene.o(.text);
asm/rayquaza_scene.o(.text); asm/rayquaza_scene.o(.text);
src/walda_phrase.o(.text); src/walda_phrase.o(.text);
asm/contest_link_81D9DE4.o(.text); asm/contest_link_81D9DE4.o(.text);
@@ -374,7 +377,7 @@ SECTIONS {
data/coord_event_weather.o(.rodata); data/coord_event_weather.o(.rodata);
data/field_tasks.o(.rodata); data/field_tasks.o(.rodata);
data/reset_rtc_screen.o(.rodata); data/reset_rtc_screen.o(.rodata);
data/start_menu.o(.rodata); src/start_menu.o(.rodata);
src/tileset_anims.o(.rodata); src/tileset_anims.o(.rodata);
src/palette.o(.rodata); src/palette.o(.rodata);
data/fanfares.o(.rodata); data/fanfares.o(.rodata);
@@ -391,10 +394,12 @@ SECTIONS {
data/wild_encounter.o(.rodata); data/wild_encounter.o(.rodata);
data/field_effect.o(.rodata); data/field_effect.o(.rodata);
data/option_menu.o(.rodata); data/option_menu.o(.rodata);
src/pokedex.o(.rodata);
data/pokedex.o(.rodata); data/pokedex.o(.rodata);
data/trainer_card.o(.rodata); data/trainer_card.o(.rodata);
src/pokemon_storage_system.o(.rodata);
data/pokemon_storage_system.o(.rodata); data/pokemon_storage_system.o(.rodata);
data/pokemon_icon.o(.rodata); src/pokemon_icon.o(.rodata);
data/fldeff_cut.o(.rodata); data/fldeff_cut.o(.rodata);
data/map_name_popup.o(.rodata); data/map_name_popup.o(.rodata);
data/item_menu_icons.o(.rodata); data/item_menu_icons.o(.rodata);
@@ -416,7 +421,7 @@ SECTIONS {
data/rotating_gate.o(.rodata); data/rotating_gate.o(.rodata);
data/item_use.o(.rodata); data/item_use.o(.rodata);
data/battle_anim_80FE840.o(.rodata); data/battle_anim_80FE840.o(.rodata);
data/bike.o(.rodata); src/bike.o(.rodata);
data/easy_chat.o(.rodata); data/easy_chat.o(.rodata);
data/mon_markings.o(.rodata); data/mon_markings.o(.rodata);
data/mauville_old_man.o(.rodata); data/mauville_old_man.o(.rodata);
@@ -496,7 +501,7 @@ SECTIONS {
src/berry_fix_program.o(.rodata); src/berry_fix_program.o(.rodata);
data/pokemon_summary_screen.o(.rodata); data/pokemon_summary_screen.o(.rodata);
data/pokenav.o(.rodata); data/pokenav.o(.rodata);
data/rayquaza_scene.o(.rodata); src/rayquaza_scene.o(.rodata);
src/walda_phrase.o(.rodata); src/walda_phrase.o(.rodata);
data/trainer_rematch.o(.rodata); data/trainer_rematch.o(.rodata);
data/unk_sprite_file.o(.rodata); data/unk_sprite_file.o(.rodata);
src/bike.c
+1078
View File
File diff suppressed because it is too large Load Diff
src/evolution_scene.c
+3 -3
View File
@@ -78,7 +78,7 @@ extern void sub_806A068(u16, u8);
extern void sub_807F19C(void); extern void sub_807F19C(void);
extern void sub_807B140(void); extern void sub_807B140(void);
extern void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies); extern void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
extern void sub_8085784(void); extern void Overworld_PlaySpecialMapMusic(void);
extern void sub_81BFA38(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move); extern void sub_81BFA38(struct Pokemon *party, u8 monId, u8 partyCount, void *CB2_ptr, u16 move);
extern u8 sub_81C1B94(void); extern u8 sub_81C1B94(void);
extern void sub_807F1A8(u8 arg0, const u8 *arg1, u8 arg2); extern void sub_807F1A8(u8 arg0, const u8 *arg1, u8 arg2);
@@ -764,7 +764,7 @@ static void Task_EvolutionScene(u8 taskID)
if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE)) if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE))
{ {
StopMapMusic(); StopMapMusic();
sub_8085784(); Overworld_PlaySpecialMapMusic();
} }
gTasks[taskID].tBits |= TASK_BIT_LEARN_MOVE; gTasks[taskID].tBits |= TASK_BIT_LEARN_MOVE;
@@ -793,7 +793,7 @@ static void Task_EvolutionScene(u8 taskID)
if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE)) if (!(gTasks[taskID].tBits & TASK_BIT_LEARN_MOVE))
{ {
StopMapMusic(); StopMapMusic();
sub_8085784(); Overworld_PlaySpecialMapMusic();
} }
if (!gTasks[taskID].tEvoWasStopped) if (!gTasks[taskID].tEvoWasStopped)
CreateShedinja(gTasks[taskID].tPreEvoSpecies, mon); CreateShedinja(gTasks[taskID].tPreEvoSpecies, mon);
src/field_map_obj.c
+2 -2
View File
@@ -3231,7 +3231,7 @@ bool8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Spr
bool8 sub_8091EC0(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_8091EC0(struct MapObject *mapObject, struct Sprite *sprite)
{ {
if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.running1 == 2) if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == 2)
{ {
return FALSE; return FALSE;
} }
@@ -3410,7 +3410,7 @@ field_object_step(CopyPlayer2, gUnknown_0850DA90)
bool8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite) bool8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite)
{ {
if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.running1 == 2) if (gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1C == 0xFF || gPlayerAvatar.tileTransitionState == 2)
{ {
return FALSE; return FALSE;
} }
src/pokedex.c
+542
View File
@@ -0,0 +1,542 @@
#include "global.h"
#include "gba/m4a_internal.h"
#include "pokedex.h"
#include "sprite.h"
#include "graphics.h"
#include "decompress.h"
#include "bg.h"
#include "window.h"
// this file's functions
void sub_80BE604(struct Sprite *sprite);
void sub_80BE658(struct Sprite *sprite);
void sub_80BE758(struct Sprite *sprite);
void sub_80BE780(struct Sprite *sprite);
void sub_80BE44C(struct Sprite *sprite);
void sub_80BE834(struct Sprite *sprite);
// const rom data
#include "data/pokedex_orders.h"
static const struct OamData sOamData_855CFE4 =
{
.y = 160,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.x = 0,
.matrixNum = 0,
.size = 0,
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
.affineParam = 0
};
static const struct OamData sOamData_855CFEC =
{
.y = 160,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 1,
.x = 0,
.matrixNum = 0,
.size = 0,
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
.affineParam = 0
};
static const struct OamData sOamData_855CFF4 =
{
.y = 160,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 1,
.x = 0,
.matrixNum = 0,
.size = 2,
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
.affineParam = 0
};
static const struct OamData sOamData_855CFFC =
{
.y = 160,
.affineMode = 0,
.objMode = 2,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.x = 0,
.matrixNum = 0,
.size = 2,
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
.affineParam = 0
};
static const struct OamData sOamData_855D004 =
{
.y = 160,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 1,
.x = 0,
.matrixNum = 0,
.size = 3,
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
.affineParam = 0
};
static const struct OamData sOamData_855D00C =
{
.y = 160,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 2,
.x = 0,
.matrixNum = 0,
.size = 0,
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
.affineParam = 0
};
static const union AnimCmd sSpriteAnim_855D014[] =
{
ANIMCMD_FRAME(3, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D01C[] =
{
ANIMCMD_FRAME(1, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D024[] =
{
ANIMCMD_FRAME(16, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D02C[] =
{
ANIMCMD_FRAME(48, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D034[] =
{
ANIMCMD_FRAME(40, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D03C[] =
{
ANIMCMD_FRAME(32, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D044[] =
{
ANIMCMD_FRAME(56, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D04C[] =
{
ANIMCMD_FRAME(64, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D054[] =
{
ANIMCMD_FRAME(96, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D05C[] =
{
ANIMCMD_FRAME(160, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D064[] =
{
ANIMCMD_FRAME(168, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D06C[] =
{
ANIMCMD_FRAME(128, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D074[] =
{
ANIMCMD_FRAME(130, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D07C[] =
{
ANIMCMD_FRAME(132, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D084[] =
{
ANIMCMD_FRAME(134, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D08C[] =
{
ANIMCMD_FRAME(136, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D094[] =
{
ANIMCMD_FRAME(138, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D09C[] =
{
ANIMCMD_FRAME(140, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0A4[] =
{
ANIMCMD_FRAME(142, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0AC[] =
{
ANIMCMD_FRAME(144, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0B4[] =
{
ANIMCMD_FRAME(146, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0BC[] =
{
ANIMCMD_FRAME(176, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0C4[] =
{
ANIMCMD_FRAME(178, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0CC[] =
{
ANIMCMD_FRAME(180, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0D4[] =
{
ANIMCMD_FRAME(182, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0DC[] =
{
ANIMCMD_FRAME(184, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0E4[] =
{
ANIMCMD_FRAME(186, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0EC[] =
{
ANIMCMD_FRAME(188, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0F4[] =
{
ANIMCMD_FRAME(190, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D0FC[] =
{
ANIMCMD_FRAME(192, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D104[] =
{
ANIMCMD_FRAME(194, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_855D10C[] =
{
ANIMCMD_FRAME(4, 30),
ANIMCMD_END
};
static const union AnimCmd *const sSpriteAnimTable_855D114[] =
{
sSpriteAnim_855D014
};
static const union AnimCmd *const sSpriteAnimTable_855D118[] =
{
sSpriteAnim_855D01C
};
static const union AnimCmd *const sSpriteAnimTable_855D11C[] =
{
sSpriteAnim_855D024
};
static const union AnimCmd *const sSpriteAnimTable_855D120[] =
{
sSpriteAnim_855D02C,
sSpriteAnim_855D034,
sSpriteAnim_855D03C,
sSpriteAnim_855D044
};
static const union AnimCmd *const sSpriteAnimTable_855D130[] =
{
sSpriteAnim_855D04C,
sSpriteAnim_855D054
};
static const union AnimCmd *const sSpriteAnimTable_855D138[] =
{
sSpriteAnim_855D05C,
sSpriteAnim_855D064
};
static const union AnimCmd *const sSpriteAnimTable_855D140[] =
{
sSpriteAnim_855D06C,
sSpriteAnim_855D074,
sSpriteAnim_855D07C,
sSpriteAnim_855D084,
sSpriteAnim_855D08C,
sSpriteAnim_855D094,
sSpriteAnim_855D09C,
sSpriteAnim_855D0A4,
sSpriteAnim_855D0AC,
sSpriteAnim_855D0B4
};
static const union AnimCmd *const sSpriteAnimTable_855D168[] =
{
sSpriteAnim_855D0BC,
sSpriteAnim_855D0C4,
sSpriteAnim_855D0CC,
sSpriteAnim_855D0D4,
sSpriteAnim_855D0DC,
sSpriteAnim_855D0E4,
sSpriteAnim_855D0EC,
sSpriteAnim_855D0F4,
sSpriteAnim_855D0FC,
sSpriteAnim_855D104
};
static const union AnimCmd *const sSpriteAnimTable_855D190[] =
{
sSpriteAnim_855D10C
};
const struct SpriteTemplate gUnknown_0855D194 =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855CFE4,
.anims = sSpriteAnimTable_855D114,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE604,
};
const struct SpriteTemplate gUnknown_0855D1AC =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855CFEC,
.anims = sSpriteAnimTable_855D118,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE658,
};
const struct SpriteTemplate gUnknown_0855D1C4 =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855CFF4,
.anims = sSpriteAnimTable_855D120,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE758,
};
const struct SpriteTemplate gUnknown_0855D1DC =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855CFFC,
.anims = sSpriteAnimTable_855D11C,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE780,
};
const struct SpriteTemplate gUnknown_0855D1F4 =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855D004,
.anims = sSpriteAnimTable_855D130,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE44C,
};
const struct SpriteTemplate gUnknown_0855D20C =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855CFF4,
.anims = sSpriteAnimTable_855D138,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE44C,
};
const struct SpriteTemplate gUnknown_0855D224 =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855D00C,
.anims = sSpriteAnimTable_855D140,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE44C,
};
const struct SpriteTemplate gUnknown_0855D23C =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855D00C,
.anims = sSpriteAnimTable_855D168,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE44C,
};
const struct SpriteTemplate gUnknown_0855D254 =
{
.tileTag = 4096,
.paletteTag = 4096,
.oam = &sOamData_855D00C,
.anims = sSpriteAnimTable_855D190,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80BE834,
};
const struct CompressedSpriteSheet gSpriteSheets_0855D26C[] =
{
{gUnknown_08DC234C, 0x2000, 4096},
{0}
};
const struct CompressedSpritePalette gSpritePalettes_0855D26C[] =
{
{gUnknown_08DC16F4, 4096},
{0}
};
const u8 gUnknown_0855D28C[] = {0x4, 0x8, 0x10, 0x20, 0x20};
const u8 gUnknown_0855D291[] = {0x8, 0x4, 0x2, 0x1, 0x1};
const struct BgTemplate gBgTemplates_0855D298[] =
{
{
.bg = 0,
.charBaseIndex = 0,
.mapBaseIndex = 12,
.screenSize = 0,
.paletteMode = 0,
.priority = 0,
.baseTile = 0
},
{
.bg = 1,
.charBaseIndex = 0,
.mapBaseIndex = 13,
.screenSize = 0,
.paletteMode = 0,
.priority = 1,
.baseTile = 0
},
{
.bg = 2,
.charBaseIndex = 2,
.mapBaseIndex = 14,
.screenSize = 0,
.paletteMode = 0,
.priority = 2,
.baseTile = 0
},
{
.bg = 3,
.charBaseIndex = 0,
.mapBaseIndex = 15,
.screenSize = 0,
.paletteMode = 0,
.priority = 3,
.baseTile = 0
}
};
const struct WindowTemplate sWindowTemplates_0855D2A8[] =
{
{2, 0, 0, 0x20, 0x20, 0, 1},
DUMMY_WIN_TEMPLATE
};
src/pokemon_icon.c
+1014
View File
File diff suppressed because it is too large Load Diff
src/pokemon_storage_system.c
+67
View File
@@ -5,9 +5,76 @@
#include "event_data.h" #include "event_data.h"
#include "string_util.h" #include "string_util.h"
#include "text.h" #include "text.h"
#include "strings.h"
#include "window.h"
IWRAM_DATA u8 gUnknown_03000F78[0x188]; IWRAM_DATA u8 gUnknown_03000F78[0x188];
struct OptionAndDescription
{
const u8 *optionTxt;
const u8 *descriptionTxt;
};
// const rom data
const struct OptionAndDescription gUnknown_085716C0[] =
{
{gText_WithdrawPokemon, gText_WithdrawMonDescription},
{gText_DepositPokemon, gText_DepositMonDescription},
{gText_MovePokemon, gText_MoveMonDescription},
{gText_MoveItems, gText_MoveItemsDescription},
{gText_SeeYa, gText_SeeYaDescription}
};
const struct WindowTemplate gUnknown_085716E8 = {0, 1, 1, 0x11, 0xA, 0xF, 1};
static const union AnimCmd sSpriteAnim_85716F0[] =
{
ANIMCMD_FRAME(0, 5),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_85716F8[] =
{
ANIMCMD_FRAME(4, 5),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8571700[] =
{
ANIMCMD_FRAME(6, 5),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8571708[] =
{
ANIMCMD_FRAME(10, 5),
ANIMCMD_END
};
const union AnimCmd *const sSpriteAnimTable_8571710[] =
{
sSpriteAnim_85716F0,
sSpriteAnim_85716F8,
sSpriteAnim_8571700,
sSpriteAnim_8571708
};
static const union AffineAnimCmd sSpriteAffineAnim_8571720[] =
{
AFFINEANIMCMD_FRAME(0xE0, 0xE0, 0, 0),
AFFINEANIMCMD_END
};
static const union AffineAnimCmd *const sSpriteAffineAnimTable_8571730[] =
{
sSpriteAffineAnim_8571720
};
const struct TextColor gUnknown_08571734[] = {4, 0xF, 0xE};
const u8 gUnknown_08571737[] = _("/30");
// code
u8 CountMonsInBox(u8 boxId) u8 CountMonsInBox(u8 boxId)
{ {
u16 i, count; u16 i, count;
src/rayquaza_scene.c
+1164
View File
File diff suppressed because it is too large Load Diff
src/start_menu.c
+82 -20
View File
@@ -6,6 +6,8 @@
#include "window.h" #include "window.h"
#include "string_util.h" #include "string_util.h"
#include "text.h" #include "text.h"
#include "strings.h"
#include "bg.h"
// Menu actions // Menu actions
enum enum
@@ -25,15 +27,6 @@ enum
MENU_ACTION_PYRAMID_BAG MENU_ACTION_PYRAMID_BAG
}; };
static void BuildStartMenuActions_LinkMode(void);
static void BuildStartMenuActions_UnionRoom(void);
static void BuildStartMenuActions_SafariZone(void);
static void BuildStartMenuActions_BattlePike(void);
static void BuildStartMenuActions_BattlePyramid(void);
static void BuildStartMenuActions_MultiBattleRoom(void);
static void BuildStartMenuActions_Normal(void);
u8 StartMenu_PlayerName(void);
extern bool32 is_c1_link_related_active(void); extern bool32 is_c1_link_related_active(void);
extern bool32 InUnionRoom(void); extern bool32 InUnionRoom(void);
extern bool8 InBattlePike(void); extern bool8 InBattlePike(void);
@@ -42,12 +35,91 @@ extern bool8 InMultiBattleRoom(void);
extern void sub_81973FC(u8 windowId, u8 a1); extern void sub_81973FC(u8 windowId, u8 a1);
extern void sub_8198070(u8 windowId, u8 a1); extern void sub_8198070(u8 windowId, u8 a1);
// this file's functions
static void BuildStartMenuActions_LinkMode(void);
static void BuildStartMenuActions_UnionRoom(void);
static void BuildStartMenuActions_SafariZone(void);
static void BuildStartMenuActions_BattlePike(void);
static void BuildStartMenuActions_BattlePyramid(void);
static void BuildStartMenuActions_MultiBattleRoom(void);
static void BuildStartMenuActions_Normal(void);
bool8 StartMenu_Pokedex(void);
bool8 StartMenu_Pokemon(void);
bool8 StartMenu_Bag(void);
bool8 StartMenu_PokeNav(void);
bool8 StartMenu_PlayerName(void);
bool8 StartMenu_Save(void);
bool8 StartMenu_Option(void);
bool8 StartMenu_Exit(void);
bool8 StartMenu_SafariZoneRetire(void);
bool8 StartMenu_LinkModePlayerName(void);
bool8 StartMenu_BattlePyramidRetire(void);
bool8 StartMenu_BattlePyramidBag(void);
// EWRAM vars
EWRAM_DATA u8 sSafariBallsWindowId = 0; EWRAM_DATA u8 sSafariBallsWindowId = 0;
EWRAM_DATA u8 sBattlePyramidFloorWindowId = 0; EWRAM_DATA u8 sBattlePyramidFloorWindowId = 0;
EWRAM_DATA u8 sStartMenuCursorPos = 0; EWRAM_DATA u8 sStartMenuCursorPos = 0;
EWRAM_DATA u8 sNumStartMenuActions = 0; EWRAM_DATA u8 sNumStartMenuActions = 0;
EWRAM_DATA u8 sCurrentStartMenuActions[9] = {0}; EWRAM_DATA u8 sCurrentStartMenuActions[9] = {0};
// const rom data
static const struct WindowTemplate gSafariBallsWindowTemplate = {0, 1, 1, 9, 4, 0xF, 8};
static const u8* const sPyramindFloorNames[] =
{
gText_Floor1,
gText_Floor2,
gText_Floor3,
gText_Floor4,
gText_Floor5,
gText_Floor6,
gText_Floor7,
gText_Peak
};
static const struct WindowTemplate gPyramidFloorWindowTemplate_2 = {0, 1, 1, 0xA, 4, 0xF, 8};
static const struct WindowTemplate gPyramidFloorWindowTemplate_1 = {0, 1, 1, 0xC, 4, 0xF, 8};
const struct MenuAction sStartMenuItems[] =
{
{gText_MenuPokedex, {.u8_void = StartMenu_Pokedex}},
{gText_MenuPokemon, {.u8_void = StartMenu_Pokemon}},
{gText_MenuBag, {.u8_void = StartMenu_Bag}},
{gText_MenuPokenav, {.u8_void = StartMenu_PokeNav}},
{gText_MenuPlayer, {.u8_void = StartMenu_PlayerName}},
{gText_MenuSave, {.u8_void = StartMenu_Save}},
{gText_MenuOption, {.u8_void = StartMenu_Option}},
{gText_MenuExit, {.u8_void = StartMenu_Exit}},
{gText_MenuRetire, {.u8_void = StartMenu_SafariZoneRetire}},
{gText_MenuPlayer, {.u8_void = StartMenu_LinkModePlayerName}},
{gText_MenuRest, {.u8_void = StartMenu_Save}},
{gText_MenuRetire, {.u8_void = StartMenu_BattlePyramidRetire}},
{gText_MenuBag, {.u8_void = StartMenu_BattlePyramidBag}}
};
const struct BgTemplate gUnknown_085105A8[] =
{
{
.bg = 0,
.charBaseIndex = 2,
.mapBaseIndex = 31,
.screenSize = 0,
.paletteMode = 0,
.priority = 0,
.baseTile = 0
}
};
const struct WindowTemplate gUnknown_085105AC[] =
{
{0, 2, 0xF, 0x1A, 4, 0xF, 0x194},
DUMMY_WIN_TEMPLATE
};
const struct WindowTemplate gUnknown_085105BC = {0, 1, 1, 0xE, 0xA, 0xF, 8};
// code
void BuildStartMenuActions(void) void BuildStartMenuActions(void)
{ {
sNumStartMenuActions = 0; sNumStartMenuActions = 0;
@@ -148,11 +220,6 @@ static void BuildStartMenuActions_MultiBattleRoom(void)
AddStartMenuAction(MENU_ACTION_EXIT); AddStartMenuAction(MENU_ACTION_EXIT);
} }
extern const struct WindowTemplate gSafariBallsWindowTemplate;
extern const struct WindowTemplate gPyramidFloorWindowTemplate_1;
extern const struct WindowTemplate gPyramidFloorWindowTemplate_2;
extern const u8 gText_SafariBallStock[];
void DisplaySafariBallsWindow(void) void DisplaySafariBallsWindow(void)
{ {
sSafariBallsWindowId = AddWindow(&gSafariBallsWindowTemplate); sSafariBallsWindowId = AddWindow(&gSafariBallsWindowTemplate);
@@ -164,9 +231,6 @@ void DisplaySafariBallsWindow(void)
CopyWindowToVram(sSafariBallsWindowId, 2); CopyWindowToVram(sSafariBallsWindowId, 2);
} }
extern const u8* const gUnknown_08510510[];
extern const u8 gText_BattlePyramidFloor[];
void DisplayPyramidFloorWindow(void) void DisplayPyramidFloorWindow(void)
{ {
// TODO: fix location // TODO: fix location
@@ -176,7 +240,7 @@ void DisplayPyramidFloorWindow(void)
sBattlePyramidFloorWindowId = AddWindow(&gPyramidFloorWindowTemplate_2); sBattlePyramidFloorWindowId = AddWindow(&gPyramidFloorWindowTemplate_2);
PutWindowTilemap(sBattlePyramidFloorWindowId); PutWindowTilemap(sBattlePyramidFloorWindowId);
sub_81973FC(sBattlePyramidFloorWindowId, 0); sub_81973FC(sBattlePyramidFloorWindowId, 0);
StringCopy(gStringVar1, gUnknown_08510510[gSaveBlock2Ptr->field_CAA[4]]); StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->field_CAA[4]]);
StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor); StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor);
PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL); PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
CopyWindowToVram(sBattlePyramidFloorWindowId, 2); CopyWindowToVram(sBattlePyramidFloorWindowId, 2);
@@ -197,8 +261,6 @@ void RemoveExtraStartMenuWindows(void)
} }
} }
extern const struct MenuAction sStartMenuItems[];
/* /*
// Prints n menu items starting at *index // Prints n menu items starting at *index
static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n) static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n)
sym_ewram.txt
+2 -2
View File
@@ -1118,10 +1118,10 @@ gUnknown_0203AB40: @ 203AB40
.include "src/pokeblock.o" .include "src/pokeblock.o"
gUnknown_0203AB54: @ 203AB54 gBikeCyclingChallenge: @ 203AB54
.space 0x1 .space 0x1
gUnknown_0203AB55: @ 203AB55 gBikeCollisions: @ 203AB55
.space 0x3 .space 0x3
gUnknown_0203AB58: @ 203AB58 gUnknown_0203AB58: @ 203AB58