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

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

Browse Source
This commit is contained in:
camthesaxman
2018-01-21 22:29:35 -06:00
parent a78b0636f5 f57340b729
commit 663ecd0014
1804 changed files with 46206 additions and 19652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+28
View File
@@ -0,0 +1,28 @@
language: generic
dist: trusty
sudo: false
env:
global:
- DEVKITARM=$HOME/devkitARM
addons:
apt:
packages:
- gcc-multilib
- linux-libc-dev
cache:
apt: true
install:
- pushd $HOME
- travis_retry wget http://download.sourceforge.net/devkitpro/devkitARM_r46-x86_64-linux.tar.bz2
- tar xf devkitARM*.tar.bz2
- travis_retry git clone https://github.com/pret/agbcc.git
- cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR
- popd
matrix:
include:
- os: linux
env: _="Build"
script:
- ./build_tools.sh
- make -j2 compare
INSTALL.md
+4 -4
View File
@@ -1,4 +1,4 @@
First, you must put a Pokémon Emerald (US) ROM in the root directory of the repository and name it `baserom.gba`. It should have a SHA1 checksum of `f3ae088181bf583e55daf962a92bb46f4f1d07b7`. Then, follow the OS-specific instructions below. Follow the OS-specific instructions below.
# Linux # Linux
@@ -8,12 +8,12 @@ Make sure that there is an environment variable called DEVKITARM with the path o
Then get the compiler from https://github.com/pret/agbcc and run the following commands. Then get the compiler from https://github.com/pret/agbcc and run the following commands.
build.sh ./build.sh
install.sh PATH_OF_POKEEMERALD_DIRECTORY ./install.sh PATH_OF_POKEEMERALD_DIRECTORY
Then in the pokeemerald directory, build the tools. Then in the pokeemerald directory, build the tools.
build_tools.sh ./build_tools.sh
Finally, build the rom. Finally, build the rom.
Makefile
+7 -5
View File
@@ -31,8 +31,7 @@ LDFLAGS = -Map ../../$(MAP)
OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
LIBGCC := tools/agbcc/lib/libgcc.a LIBGCC := tools/agbcc/lib/libgcc.a
LIBC := tools/agbcc/lib/libc.a
LIBC := tools/agbcc/lib/libc.a
SHA1 := sha1sum -c SHA1 := sha1sum -c
@@ -43,14 +42,16 @@ SCANINC := tools/scaninc/scaninc
PREPROC := tools/preproc/preproc PREPROC := tools/preproc/preproc
RAMSCRGEN := tools/ramscrgen/ramscrgen RAMSCRGEN := tools/ramscrgen/ramscrgen
# Clear the default suffixes. # Clear the default suffixes
.SUFFIXES: .SUFFIXES:
# Don't delete intermediate files
.SECONDARY:
# Delete files that weren't built properly
.DELETE_ON_ERROR:
# Secondary expansion is required for dependency variables in object rules. # Secondary expansion is required for dependency variables in object rules.
.SECONDEXPANSION: .SECONDEXPANSION:
.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin sound/direct_sound_samples/cry_%.bin
.PHONY: rom clean compare tidy .PHONY: rom clean compare tidy
$(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR)) $(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR))
@@ -166,3 +167,4 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
$(ROM): $(ELF) $(ROM): $(ELF)
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
README.md
+5 -1
View File
@@ -1,12 +1,14 @@
# Pokémon Emerald # Pokémon Emerald
[![Build Status][travis-badge]][travis]
This is a disassembly of Pokémon Emerald. This is a disassembly of Pokémon Emerald.
It builds the following rom: It builds the following rom:
* pokeemerald.gba `sha1: f3ae088181bf583e55daf962a92bb46f4f1d07b7` * pokeemerald.gba `sha1: f3ae088181bf583e55daf962a92bb46f4f1d07b7`
To set up the repository, see [**INSTALL.md**](INSTALL.md). To set up the repository, see [INSTALL.md](INSTALL.md).
## See also ## See also
@@ -32,3 +34,5 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
[pokefirered]: https://github.com/pret/pokefirered [pokefirered]: https://github.com/pret/pokefirered
[Discord]: https://discord.gg/cJxDDVP [Discord]: https://discord.gg/cJxDDVP
[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
[travis]: https://travis-ci.org/pret/pokeemerald
[travis-badge]: https://travis-ci.org/pret/pokeemerald.svg?branch=master
asm/battle_anim_80D51AC.s
Executable → Regular
View File
asm/battle_anim_80FE840.s
+3 -3
View File
@@ -18852,7 +18852,7 @@ _0810800C:
negs r0, r0 negs r0, r0
cmp r1, r0 cmp r1, r0
bne _08108022 bne _08108022
bl remove_some_task bl ScanlineEffect_Stop
adds r0, r7, 0 adds r0, r7, 0
bl DestroyTask bl DestroyTask
_08108022: _08108022:
@@ -26963,7 +26963,7 @@ _0810C0E2:
bl sub_80A6B30 bl sub_80A6B30
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, =gUnknown_0854CAD0 ldr r1, =gWeatherFog1Tiles
movs r2, 0x80 movs r2, 0x80
lsls r2, 4 lsls r2, 4
mov r3, sp mov r3, sp
@@ -27245,7 +27245,7 @@ _0810C366:
bl sub_80A6B30 bl sub_80A6B30
mov r0, sp mov r0, sp
ldrb r0, [r0, 0x9] ldrb r0, [r0, 0x9]
ldr r1, =gUnknown_0854CAD0 ldr r1, =gWeatherFog1Tiles
movs r2, 0x80 movs r2, 0x80
lsls r2, 4 lsls r2, 4
mov r3, sp mov r3, sp
asm/battle_anim_815A0D4.s
Executable → Regular
View File
asm/battle_frontier_1.s
Executable → Regular
+3 -3
View File
@@ -9449,7 +9449,7 @@ _08193AA8:
b _08193BC2 b _08193BC2
_08193ABA: _08193ABA:
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
bl remove_some_task bl ScanlineEffect_Stop
ldr r4, =gUnknown_0203CD7C ldr r4, =gUnknown_0203CD7C
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
@@ -9494,7 +9494,7 @@ _08193B20:
cmp r6, 0 cmp r6, 0
bne _08193BC2 bne _08193BC2
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
bl remove_some_task bl ScanlineEffect_Stop
ldr r4, =gUnknown_0203CD7C ldr r4, =gUnknown_0203CD7C
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
@@ -9534,7 +9534,7 @@ _08193B84:
cmp r6, 0 cmp r6, 0
bne _08193BC2 bne _08193BC2
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
bl remove_some_task bl ScanlineEffect_Stop
ldr r4, =gUnknown_0203CD7C ldr r4, =gUnknown_0203CD7C
ldr r0, [r4] ldr r0, [r4]
bl Free bl Free
asm/battle_frontier_2.s
Executable → Regular
+1 -1
View File
@@ -18556,7 +18556,7 @@ _081A4202:
thumb_func_start sub_81A4224 thumb_func_start sub_81A4224
sub_81A4224: @ 81A4224 sub_81A4224: @ 81A4224
push {lr} push {lr}
bl sub_81652B4 bl ValidateEReaderTrainer
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_81A4224 thumb_func_end sub_81A4224
asm/battle_records.s
+1 -1
View File
@@ -1034,7 +1034,7 @@ _0813C6FA:
thumb_func_start sub_813C80C thumb_func_start sub_813C80C
sub_813C80C: @ 813C80C sub_813C80C: @ 813C80C
push {lr} push {lr}
bl remove_some_task bl ScanlineEffect_Stop
bl ResetTasks bl ResetTasks
bl ResetSpriteData bl ResetSpriteData
bl ResetPaletteFade bl ResetPaletteFade
asm/battle_tent.s
Executable → Regular
View File
asm/battle_tower.s
Executable → Regular
+3 -3
View File
@@ -5898,8 +5898,8 @@ _08165294:
.pool .pool
thumb_func_end GetEreaderTrainerName thumb_func_end GetEreaderTrainerName
thumb_func_start sub_81652B4 thumb_func_start ValidateEReaderTrainer
sub_81652B4: @ 81652B4 ValidateEReaderTrainer: @ 81652B4
push {r4-r6,lr} push {r4-r6,lr}
ldr r2, =gSpecialVar_Result ldr r2, =gSpecialVar_Result
movs r0, 0 movs r0, 0
@@ -5951,7 +5951,7 @@ _08165316:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_81652B4 thumb_func_end ValidateEReaderTrainer
thumb_func_start sub_8165328 thumb_func_start sub_8165328
sub_8165328: @ 8165328 sub_8165328: @ 8165328
asm/battle_transition.s
-9826
View File
File diff suppressed because it is too large Load Diff
asm/berry_tag_screen.s
+1 -1
View File
@@ -119,7 +119,7 @@ _08177D18:
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
b _08177DDC b _08177DDC
_08177D26: _08177D26:
bl remove_some_task bl ScanlineEffect_Stop
b _08177DDC b _08177DDC
_08177D2C: _08177D2C:
bl ResetPaletteFade bl ResetPaletteFade
asm/cable_car.s
+1 -1
View File
@@ -88,7 +88,7 @@ _0814FD20:
bl SetVBlankCallback bl SetVBlankCallback
movs r0, 0 movs r0, 0
bl sub_8150B6C bl sub_8150B6C
bl remove_some_task bl ScanlineEffect_Stop
movs r3, 0xC0 movs r3, 0xC0
lsls r3, 19 lsls r3, 19
movs r4, 0xC0 movs r4, 0xC0
asm/contest_link_81D9DE4.s
Executable → Regular
View File
asm/contest_painting.s
+1 -1
View File
@@ -107,7 +107,7 @@ _0812FE80:
.4byte _0812FF2A .4byte _0812FF2A
.4byte _0812FF54 .4byte _0812FF54
_0812FE94: _0812FE94:
bl remove_some_task bl ScanlineEffect_Stop
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
bl AllocateMonSpritesGfx bl AllocateMonSpritesGfx
asm/field_effect.s
+3 -3
View File
@@ -498,8 +498,8 @@ _080B5E68:
bx r1 bx r1
thumb_func_end FieldEffectActiveListContains thumb_func_end FieldEffectActiveListContains
thumb_func_start sub_80B5E6C thumb_func_start CreateTrainerSprite
sub_80B5E6C: @ 80B5E6C CreateTrainerSprite: @ 80B5E6C
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -566,7 +566,7 @@ sub_80B5E6C: @ 80B5E6C
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_80B5E6C thumb_func_end CreateTrainerSprite
thumb_func_start sub_80B5F0C thumb_func_start sub_80B5F0C
sub_80B5F0C: @ 80B5F0C sub_80B5F0C: @ 80B5F0C
asm/field_screen.s
+15 -15
View File
@@ -2725,13 +2725,13 @@ sub_80AC594: @ 80AC594
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
beq _080AC650 beq _080AC650
ldr r0, =gUnknown_0854FB5C ldr r0, =sCloudSpriteSheet
bl LoadSpriteSheet bl LoadSpriteSheet
ldr r0, =gUnknown_0854C290 ldr r0, =gUnknown_0854C290
bl sub_80ABF4C bl sub_80ABF4C
movs r5, 0 movs r5, 0
_080AC5B2: _080AC5B2:
ldr r0, =gUnknown_0854FB78 ldr r0, =sCloudSpriteTemplate
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0xFF movs r3, 0xFF
@@ -3676,7 +3676,7 @@ sub_80ACD78: @ 80ACD78
b _080ACE98 b _080ACE98
_080ACD92: _080ACD92:
ldrb r7, [r2] ldrb r7, [r2]
ldr r0, =gUnknown_0854FC2C ldr r0, =gSpriteTemplate_854FC2C
ldr r2, =gUnknown_0854FB90 ldr r2, =gUnknown_0854FB90
lsls r6, r7, 2 lsls r6, r7, 2
adds r2, r6, r2 adds r2, r6, r2
@@ -5461,7 +5461,7 @@ sub_80ADCAC: @ 80ADCAC
bl LoadSpriteSheet bl LoadSpriteSheet
movs r5, 0 movs r5, 0
_080ADCD0: _080ADCD0:
ldr r0, =gUnknown_0854FD18 ldr r0, =gSpriteTemplate_854FD18
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0xFF movs r3, 0xFF
@@ -5792,7 +5792,7 @@ sub_80ADF6C: @ 80ADF6C
bne _080AE008 bne _080AE008
movs r5, 0 movs r5, 0
_080ADF80: _080ADF80:
ldr r0, =gUnknown_0854FD58 ldr r0, =gSpriteTemplate_854FD58
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
movs r3, 0x4E movs r3, 0x4E
@@ -6240,7 +6240,7 @@ _080AE314:
adds r5, r0, 0 adds r5, r0, 0
lsls r2, r5, 22 lsls r2, r5, 22
asrs r2, 16 asrs r2, 16
ldr r0, =gUnknown_0854FD8C ldr r0, =gSpriteTemplate_854FD8C
movs r1, 0 movs r1, 0
movs r3, 0xFF movs r3, 0xFF
bl CreateSpriteAtEnd bl CreateSpriteAtEnd
@@ -6753,7 +6753,7 @@ _080AE758:
adds r6, r0, 0 adds r6, r0, 0
lsls r2, r6, 22 lsls r2, r6, 22
asrs r2, 16 asrs r2, 16
ldr r0, =gUnknown_0854FDC4 ldr r0, =gSpriteTemplate_854FDC4
movs r1, 0 movs r1, 0
movs r3, 0x1 movs r3, 0x1
bl CreateSpriteAtEnd bl CreateSpriteAtEnd
@@ -6840,7 +6840,7 @@ _080AE818:
adds r1, 0x18 adds r1, 0x18
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
ldr r0, =gUnknown_0854FDC4 ldr r0, =gSpriteTemplate_854FDC4
movs r2, 0xD0 movs r2, 0xD0
movs r3, 0x1 movs r3, 0x1
bl CreateSpriteAtEnd bl CreateSpriteAtEnd
@@ -7239,7 +7239,7 @@ sub_80AEB48: @ 80AEB48
ldrh r2, [r0] ldrh r2, [r0]
ldrh r0, [r1] ldrh r0, [r1]
subs r2, r0 subs r2, r0
ldr r0, =gUnknown_0854FE44 ldr r0, =gSpriteTemplate_854FE44
movs r4, 0 movs r4, 0
ldrsh r1, [r3, r4] ldrsh r1, [r3, r4]
lsls r2, 16 lsls r2, 16
@@ -7306,7 +7306,7 @@ _080AEBE4:
adds r0, 0x14 adds r0, 0x14
adds r0, r2, r0 adds r0, r2, r0
ldr r1, [r0] ldr r1, [r0]
ldr r0, =gUnknown_0854FE44 ldr r0, =gSpriteTemplate_854FE44
cmp r1, r0 cmp r1, r0
bne _080AEBFE bne _080AEBFE
adds r0, r2, r5 adds r0, r2, r5
@@ -7332,8 +7332,8 @@ _080AEC1A:
.pool .pool
thumb_func_end sub_80AEBD0 thumb_func_end sub_80AEBD0
thumb_func_start unc_0807DAB4 thumb_func_start sub_80AEC34
unc_0807DAB4: @ 80AEC34 sub_80AEC34: @ 80AEC34
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldrh r0, [r1, 0x2E] ldrh r0, [r1, 0x2E]
@@ -7383,7 +7383,7 @@ _080AEC74:
_080AEC8E: _080AEC8E:
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end unc_0807DAB4 thumb_func_end sub_80AEC34
thumb_func_start sub_80AEC94 thumb_func_start sub_80AEC94
sub_80AEC94: @ 80AEC94 sub_80AEC94: @ 80AEC94
@@ -9621,7 +9621,7 @@ _080AFE64:
ldrsh r0, [r4, r3] ldrsh r0, [r4, r3]
cmp r0, 0x1 cmp r0, 0x1
bne _080AFEB4 bne _080AFEB4
bl remove_some_task bl ScanlineEffect_Stop
movs r0, 0x2 movs r0, 0x2
strh r0, [r4] strh r0, [r4]
b _080AFEC6 b _080AFEC6
@@ -9714,7 +9714,7 @@ _080AFF28:
ldrsh r0, [r4, r3] ldrsh r0, [r4, r3]
cmp r0, 0x1 cmp r0, 0x1
bne _080AFF78 bne _080AFF78
bl remove_some_task bl ScanlineEffect_Stop
movs r0, 0x2 movs r0, 0x2
strh r0, [r4] strh r0, [r4]
b _080AFF8A b _080AFF8A
asm/fldeff_cut.s
Executable → Regular
+1 -1
View File
@@ -244,7 +244,7 @@ _080D38F8:
lsrs r4, r0, 16 lsrs r4, r0, 16
movs r7, 0x1 movs r7, 0x1
movs r5, 0 movs r5, 0
ldr r3, =gUnknown_0857C60A ldr r3, =gUnknown_0857C608 + 2
adds r0, r2, r3 adds r0, r2, r3
ldrb r0, [r0] ldrb r0, [r0]
adds r6, 0x1 adds r6, 0x1
asm/fldeff_groundshake.s
Executable → Regular
View File
asm/fldeff_softboiled.s
Executable → Regular
View File
asm/fossil_specials.s
Executable → Regular
+1 -1
View File
@@ -657,7 +657,7 @@ _081BF0B4:
ldr r0, [r0] ldr r0, [r0]
ldr r1, [r0] ldr r1, [r0]
movs r5, 0 movs r5, 0
ldr r2, =gUnknown_08617C44 ldr r2, =gRootFossil_Gfx
_081BF0BE: _081BF0BE:
adds r0, r5, r2 adds r0, r5, r2
ldrb r0, [r0] ldrb r0, [r0]
asm/hof_pc.s
-73
View File
@@ -1,73 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start AccessHallOfFamePC
AccessHallOfFamePC: @ 8137C28
push {lr}
ldr r0, =CB2_DoHallOfFamePC
bl SetMainCallback2
bl ScriptContext2_Enable
pop {r0}
bx r0
.pool
thumb_func_end AccessHallOfFamePC
thumb_func_start ReturnFromHallOfFamePC
ReturnFromHallOfFamePC: @ 8137C3C
push {lr}
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
ldr r1, =gFieldCallback
ldr r0, =ReshowPCMenuAfterHallOfFamePC
str r0, [r1]
pop {r0}
bx r0
.pool
thumb_func_end ReturnFromHallOfFamePC
thumb_func_start ReshowPCMenuAfterHallOfFamePC
ReshowPCMenuAfterHallOfFamePC: @ 8137C5C
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
bl Overworld_PlaySpecialMapMusic
bl sp109_CreatePCMenu
bl sub_80E2514
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r0, =Task_WaitForPaletteFade
movs r1, 0xA
bl CreateTask
add sp, 0x4
pop {r0}
bx r0
.pool
thumb_func_end ReshowPCMenuAfterHallOfFamePC
thumb_func_start Task_WaitForPaletteFade
Task_WaitForPaletteFade: @ 8137C94
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _08137CAC
adds r0, r2, 0
bl DestroyTask
_08137CAC:
pop {r0}
bx r0
.pool
thumb_func_end Task_WaitForPaletteFade
asm/international_string_util.s
Executable → Regular
View File
asm/intro.s
+1 -1
View File
@@ -184,7 +184,7 @@ _0816CCF4:
movs r0, 0 movs r0, 0
movs r2, 0 movs r2, 0
bl load_copyright_graphics bl load_copyright_graphics
bl remove_some_task bl ScanlineEffect_Stop
bl ResetTasks bl ResetTasks
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
asm/item_icon.s
Executable → Regular
View File
asm/item_menu.s
Executable → Regular
+1 -1
View File
@@ -343,7 +343,7 @@ _081AAE34:
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
b _081AB012 b _081AB012
_081AAE3E: _081AAE3E:
bl remove_some_task bl ScanlineEffect_Stop
ldr r1, =gMain ldr r1, =gMain
movs r2, 0x87 movs r2, 0x87
lsls r2, 3 lsls r2, 3
asm/item_menu_icons.s
Executable → Regular
View File
asm/learn_move.s
Executable → Regular
View File
asm/link.s
+7 -7
View File
@@ -3360,7 +3360,7 @@ c2_800ACD4: @ 800AF30
movs r2, 0x2 movs r2, 0x2
bl FillPalette bl FillPalette
bl ResetTasks bl ResetTasks
bl remove_some_task bl ScanlineEffect_Stop
ldr r1, =gLinkVSyncDisabled ldr r1, =gLinkVSyncDisabled
ldrb r0, [r1] ldrb r0, [r1]
cmp r0, 0 cmp r0, 0
@@ -28637,7 +28637,7 @@ _08018482:
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
bl ResetTasks bl ResetTasks
bl remove_some_task bl ScanlineEffect_Stop
movs r0, 0 movs r0, 0
bl ResetBgsAndClearDma3BusyFlags bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_082F0598 ldr r1, =gUnknown_082F0598
@@ -32620,7 +32620,7 @@ sub_801A43C: @ 801A43C
bl ResetPaletteFade bl ResetPaletteFade
bl ResetSpriteData bl ResetSpriteData
bl ResetTasks bl ResetTasks
bl remove_some_task bl ScanlineEffect_Stop
bl m4aSoundVSyncOn bl m4aSoundVSyncOn
ldr r0, =sub_801A418 ldr r0, =sub_801A418
bl SetVBlankCallback bl SetVBlankCallback
@@ -38868,7 +38868,7 @@ _0801D7D0:
ldr r1, [r4, 0x18] ldr r1, [r4, 0x18]
movs r2, 0xBC movs r2, 0xBC
bl memcpy bl memcpy
bl sub_81652B4 bl ValidateEReaderTrainer
b _0801D804 b _0801D804
.pool .pool
_0801D7F0: _0801D7F0:
@@ -45999,7 +45999,7 @@ _080210A0:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
bl remove_some_task bl ScanlineEffect_Stop
bl reset_temp_tile_data_buffers bl reset_temp_tile_data_buffers
b _080212FC b _080212FC
_080210BE: _080210BE:
@@ -61951,7 +61951,7 @@ sub_8028FF8: @ 8028FF8
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_8098758 bl GetWindowFrameTilesPal
ldr r1, [r0] ldr r1, [r0]
movs r2, 0x90 movs r2, 0x90
lsls r2, 1 lsls r2, 1
@@ -61959,7 +61959,7 @@ sub_8028FF8: @ 8028FF8
movs r3, 0x1 movs r3, 0x1
bl LoadBgTiles bl LoadBgTiles
adds r0, r4, 0 adds r0, r4, 0
bl sub_8098758 bl GetWindowFrameTilesPal
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
movs r1, 0xA0 movs r1, 0xA0
movs r2, 0x20 movs r2, 0x20
asm/list_menu.s
Executable → Regular
View File
asm/macros/event.inc
+7
View File
@@ -262,6 +262,13 @@
.2byte \output .2byte \output
.2byte SPECIAL_\function .2byte SPECIAL_\function
.endm .endm
@ temporary solution
.macro specialvar_ output, functionId
.byte 0x26
.2byte \output
.2byte \functionId
.endm
@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang). @ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang).
.macro waitstate .macro waitstate
asm/macros/window.inc
+1 -1
View File
@@ -8,7 +8,7 @@
.2byte \vram_tile_offset .2byte \vram_tile_offset
.endm .endm
.macro window_template_terminator .macro null_window_template
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
.endm .endm
asm/main_menu.s
+8 -8
View File
@@ -127,7 +127,7 @@ InitMainMenu: @ 802F6F4
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
bl remove_some_task bl ScanlineEffect_Stop
bl ResetTasks bl ResetTasks
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
@@ -1487,7 +1487,7 @@ _08030460:
ldr r0, =gMain ldr r0, =gMain
ldr r1, =CB2_ReinitMainMenu ldr r1, =CB2_ReinitMainMenu
str r1, [r0, 0x8] str r1, [r0, 0x8]
ldr r0, =CB2_OptionsMenu ldr r0, =CB2_InitOptionMenu
b _0803048A b _0803048A
.pool .pool
_08030478: _08030478:
@@ -1929,7 +1929,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0
movs r1, 0x1 movs r1, 0x1
movs r2, 0x10 movs r2, 0x10
bl LoadPalette bl LoadPalette
bl remove_some_task bl ScanlineEffect_Stop
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
bl dp13_810BB8C bl dp13_810BB8C
@@ -3708,7 +3708,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
strh r0, [r4, 0x16] strh r0, [r4, 0x16]
ldr r0, =0x0000ffc4 ldr r0, =0x0000ffc4
strh r0, [r4, 0x10] strh r0, [r4, 0x10]
bl remove_some_task bl ScanlineEffect_Stop
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
bl dp13_810BB8C bl dp13_810BB8C
@@ -3948,7 +3948,7 @@ AddBirchSpeechObjects: @ 803192C
movs r1, 0x78 movs r1, 0x78
movs r2, 0x3C movs r2, 0x3C
movs r3, 0 movs r3, 0
bl sub_80B5E6C bl CreateTrainerSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -3981,7 +3981,7 @@ AddBirchSpeechObjects: @ 803192C
movs r1, 0x78 movs r1, 0x78
movs r2, 0x3C movs r2, 0x3C
movs r3, 0 movs r3, 0
bl sub_80B5E6C bl CreateTrainerSprite
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r2, r0, 4 lsls r2, r0, 4
@@ -4783,7 +4783,7 @@ LoadMainMenuWindowFrameTiles: @ 80320A4
ldr r0, [r6] ldr r0, [r6]
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
lsrs r0, 3 lsrs r0, 3
bl sub_8098758 bl GetWindowFrameTilesPal
ldr r1, [r0] ldr r1, [r0]
movs r2, 0x90 movs r2, 0x90
lsls r2, 1 lsls r2, 1
@@ -4793,7 +4793,7 @@ LoadMainMenuWindowFrameTiles: @ 80320A4
ldr r0, [r6] ldr r0, [r6]
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
lsrs r0, 3 lsrs r0, 3
bl sub_8098758 bl GetWindowFrameTilesPal
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
movs r1, 0x20 movs r1, 0x20
movs r2, 0x20 movs r2, 0x20
asm/map_name_popup.s
Executable → Regular
+3 -3
View File
@@ -518,7 +518,7 @@ _080D4C0A:
lsls r1, r4, 4 lsls r1, r4, 4
subs r1, r4 subs r1, r4
lsls r1, 6 lsls r1, 6
ldr r2, =gUnknown_0857DD04 ldr r2, =gMapPopUp_Outline_Table
adds r1, r2 adds r1, r2
movs r2, 0x80 movs r2, 0x80
lsls r2, 3 lsls r2, 3
@@ -541,7 +541,7 @@ _080D4C0A:
.pool .pool
_080D4C6C: _080D4C6C:
lsls r0, r4, 5 lsls r0, r4, 5
ldr r1, =gUnknown_0857F384 ldr r1, =gMapPopUp_Palette_Table
adds r0, r1 adds r0, r1
movs r1, 0xE0 movs r1, 0xE0
movs r2, 0x20 movs r2, 0x20
@@ -550,7 +550,7 @@ _080D4C7A:
lsls r1, r4, 4 lsls r1, r4, 4
subs r1, r4 subs r1, r4
lsls r1, 6 lsls r1, 6
ldr r0, =gUnknown_0857C684 ldr r0, =gMapPopUp_Table
adds r1, r0 adds r1, r0
movs r0, 0x50 movs r0, 0x50
str r0, [sp] str r0, [sp]
asm/menu.s
Executable → Regular
View File
asm/menu_indicators.s
Executable → Regular
View File
asm/mon_markings.s
+1 -1
View File
@@ -21,7 +21,7 @@ sub_811F918: @ 811F918
ldr r0, [r0] ldr r0, [r0]
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
lsrs r0, 3 lsrs r0, 3
bl sub_8098758 bl GetWindowFrameTilesPal
ldr r3, =gUnknown_0203A124 ldr r3, =gUnknown_0203A124
ldr r2, [r3] ldr r2, [r3]
ldr r1, [r0] ldr r1, [r0]
asm/mystery_event_menu.s
+1 -1
View File
@@ -468,7 +468,7 @@ _08178D74:
bne _08178E58 bne _08178E58
ldr r5, =0x0201c000 ldr r5, =0x0201c000
adds r0, r5, 0 adds r0, r5, 0
bl sub_81538A0 bl RunMysteryEventScript
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 16 lsls r4, 16
lsrs r4, 16 lsrs r4, 16
asm/mystery_event_script.s
-870
View File
@@ -1,870 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81537CC
sub_81537CC: @ 81537CC
push {r4,lr}
adds r4, r3, 0
lsls r0, 16
lsrs r0, 16
lsls r2, 16
lsrs r2, 16
movs r3, 0x1
ands r0, r3
cmp r0, 0
beq _081537FC
ands r1, r3
cmp r1, 0
beq _081537FC
movs r0, 0x4
ands r2, r0
cmp r2, 0
beq _081537FC
movs r0, 0x80
lsls r0, 2
ands r0, r4
cmp r0, 0
beq _081537FC
movs r0, 0x1
b _081537FE
_081537FC:
movs r0, 0
_081537FE:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81537CC
thumb_func_start sub_8153804
sub_8153804: @ 8153804
push {lr}
ldr r0, =gStringVar4
ldr r1, =gText_MysteryGiftCantBeUsed
bl StringExpandPlaceholders
movs r0, 0x3
bl SetMysteryEventScriptStatus
pop {r0}
bx r0
.pool
thumb_func_end sub_8153804
thumb_func_start sub_8153820
sub_8153820: @ 8153820
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r1, =gUnknown_082DED2C
ldr r2, =gUnknown_082DED2C + 0x44
bl InitScriptContext
adds r0, r4, 0
adds r1, r5, 0
bl SetupBytecodeScript
str r5, [r4, 0x64]
movs r0, 0
str r0, [r4, 0x68]
str r0, [r4, 0x6C]
str r0, [r4, 0x70]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8153820
thumb_func_start sub_8153850
sub_8153850: @ 8153850
push {r4,lr}
adds r4, r0, 0
bl RunScriptCommand
lsls r0, 24
cmp r0, 0
beq _08153868
ldr r0, [r4, 0x70]
cmp r0, 0
beq _08153868
movs r0, 0x1
b _0815386A
_08153868:
movs r0, 0
_0815386A:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8153850
thumb_func_start sub_8153870
sub_8153870: @ 8153870
push {lr}
adds r1, r0, 0
ldr r0, =gUnknown_0203BBC0
bl sub_8153820
pop {r0}
bx r0
.pool
thumb_func_end sub_8153870
thumb_func_start sub_8153884
sub_8153884: @ 8153884
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =gUnknown_0203BBC0
adds r0, r4, 0
bl sub_8153850
ldr r1, [r4, 0x6C]
str r1, [r5]
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end sub_8153884
thumb_func_start sub_81538A0
sub_81538A0: @ 81538A0
push {r4,lr}
adds r1, r0, 0
ldr r4, =gUnknown_0203BBC0
adds r0, r4, 0
bl sub_8153820
_081538AC:
adds r0, r4, 0
bl sub_8153850
cmp r0, 0
bne _081538AC
ldr r0, [r4, 0x6C]
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_81538A0
thumb_func_start SetMysteryEventScriptStatus
SetMysteryEventScriptStatus: @ 81538C4
ldr r1, =gUnknown_0203BBC0
str r0, [r1, 0x6C]
bx lr
.pool
thumb_func_end SetMysteryEventScriptStatus
thumb_func_start sub_81538D0
sub_81538D0: @ 81538D0
push {lr}
movs r2, 0
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x00003b18
adds r3, r0, r1
movs r1, 0
_081538DE:
adds r0, r3, r1
ldrb r0, [r0]
adds r2, r0
adds r1, 0x1
cmp r1, 0xB
bls _081538DE
adds r0, r2, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81538D0
thumb_func_start sub_81538F8
sub_81538F8: @ 81538F8
push {r4,r5,lr}
ldr r5, =gSaveBlock1Ptr
ldr r0, [r5]
ldr r1, =0x00003b18
adds r4, r0, r1
bl sub_81538D0
adds r1, r0, 0
ldrb r0, [r4]
cmp r0, 0
beq _0815392A
ldrb r0, [r4, 0x1]
cmp r0, 0
beq _0815392A
ldrh r0, [r4, 0x2]
cmp r0, 0
beq _0815392A
cmp r1, 0
beq _0815392A
ldr r0, [r5]
ldr r2, =0x00003b14
adds r0, r2
ldr r0, [r0]
cmp r1, r0
beq _0815393C
_0815392A:
movs r0, 0
b _0815393E
.pool
_0815393C:
movs r0, 0x1
_0815393E:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_81538F8
thumb_func_start sub_8153944
sub_8153944: @ 8153944
push {lr}
sub sp, 0x4
mov r1, sp
movs r0, 0
strh r0, [r1]
ldr r0, =gSaveBlock1Ptr
ldr r1, [r0]
ldr r0, =0x00003b14
adds r1, r0
ldr r2, =0x01000008
mov r0, sp
bl CpuSet
add sp, 0x4
pop {r0}
bx r0
.pool
thumb_func_end sub_8153944
thumb_func_start sub_8153970
sub_8153970: @ 8153970
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
adds r3, r0, 0
lsls r1, 24
lsrs r1, 24
adds r5, r1, 0
lsls r2, 16
lsrs r2, 16
adds r6, r2, 0
cmp r3, 0
beq _08153990
cmp r1, 0
beq _08153990
cmp r2, 0
bne _08153996
_08153990:
bl sub_8153944
b _081539BC
_08153996:
ldr r4, =gSaveBlock1Ptr
ldr r0, [r4]
ldr r1, =0x00003b18
adds r0, r1
strb r3, [r0]
ldr r0, [r4]
ldr r2, =0x00003b19
adds r0, r2
strb r5, [r0]
ldr r0, [r4]
adds r1, 0x2
adds r0, r1
strh r6, [r0]
bl sub_81538D0
ldr r1, [r4]
ldr r2, =0x00003b14
adds r1, r2
str r0, [r1]
_081539BC:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8153970
thumb_func_start sub_81539D4
sub_81539D4: @ 81539D4
push {r4-r6,lr}
ldr r6, =gSaveBlock1Ptr
ldr r0, [r6]
ldr r1, =0x00003b18
adds r4, r0, r1
bl sub_81538F8
cmp r0, 0
bne _081539F8
bl sub_8153944
movs r0, 0
b _08153A1A
.pool
_081539F8:
ldrh r5, [r4, 0x2]
ldrb r0, [r4, 0x1]
subs r0, 0x1
strb r0, [r4, 0x1]
lsls r0, 24
cmp r0, 0
bne _08153A0C
bl sub_8153944
b _08153A18
_08153A0C:
bl sub_81538D0
ldr r1, [r6]
ldr r2, =0x00003b14
adds r1, r2
str r0, [r1]
_08153A18:
adds r0, r5, 0
_08153A1A:
pop {r4-r6}
pop {r1}
bx r1
.pool
thumb_func_end sub_81539D4
thumb_func_start script_status_stop_and_ret_1
script_status_stop_and_ret_1: @ 8153A24
push {lr}
bl StopScript
movs r0, 0x1
pop {r1}
bx r1
thumb_func_end script_status_stop_and_ret_1
thumb_func_start sub_8153A30
sub_8153A30: @ 8153A30
push {r4-r7,lr}
adds r7, r0, 0
bl ScriptReadWord
str r0, [r7, 0x68]
adds r0, r7, 0
bl ScriptReadHalfword
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r7, 0
bl ScriptReadWord
adds r6, r0, 0
adds r0, r7, 0
bl ScriptReadHalfword
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
bl ScriptReadWord
adds r3, r0, 0
adds r0, r5, 0
adds r1, r6, 0
adds r2, r4, 0
bl sub_81537CC
cmp r0, 0x1
bne _08153A74
str r0, [r7, 0x70]
b _08153A78
_08153A74:
bl sub_8153804
_08153A78:
movs r0, 0x1
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8153A30
thumb_func_start sub_8153A80
sub_8153A80: @ 8153A80
movs r0, 0
bx lr
thumb_func_end sub_8153A80
thumb_func_start sub_8153A84
sub_8153A84: @ 8153A84
ldr r1, [r0, 0x8]
ldrb r2, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
str r2, [r0, 0x6C]
movs r0, 0
bx lr
thumb_func_end sub_8153A84
thumb_func_start sub_8153A94
sub_8153A94: @ 8153A94
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, [r4, 0x8]
ldrb r5, [r0]
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
bl ScriptReadWord
ldr r1, [r4, 0x68]
subs r0, r1
ldr r1, [r4, 0x64]
adds r1, r0, r1
cmp r5, 0xFF
beq _08153AB8
ldr r0, [r4, 0x6C]
cmp r5, r0
bne _08153ABE
_08153AB8:
ldr r0, =gStringVar4
bl StringExpandPlaceholders
_08153ABE:
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
.pool
thumb_func_end sub_8153A94
thumb_func_start sub_8153ACC
sub_8153ACC: @ 8153ACC
push {r4,lr}
adds r4, r0, 0
bl ScriptReadWord
ldr r1, [r4, 0x68]
subs r0, r1
ldr r1, [r4, 0x64]
adds r0, r1
bl ScriptContext2_RunNewScript
movs r0, 0
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8153ACC
thumb_func_start sub_8153AE8
sub_8153AE8: @ 8153AE8
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
adds r7, r0, 0
bl IsEnigmaBerryValid
mov r8, r0
adds r0, r7, 0
bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r7, 0x68]
subs r4, r0
ldr r0, [r7, 0x64]
adds r4, r0
ldr r0, =gStringVar1
mov r9, r0
ldr r6, =gSaveBlock1Ptr
ldr r1, [r6]
ldr r5, =0x000031f8
adds r1, r5
movs r2, 0x7
bl StringCopyN
adds r0, r4, 0
bl SetEnigmaBerry
ldr r4, =gStringVar2
ldr r1, [r6]
adds r1, r5
adds r0, r4, 0
movs r2, 0x7
bl StringCopyN
mov r0, r8
cmp r0, 0
bne _08153B54
ldr r0, =gStringVar4
ldr r1, =gText_MysteryGiftBerry
b _08153B74
.pool
_08153B54:
mov r0, r9
adds r1, r4, 0
bl StringCompare
cmp r0, 0
beq _08153B70
ldr r0, =gStringVar4
ldr r1, =gText_MysteryGiftBerryTransform
b _08153B74
.pool
_08153B70:
ldr r0, =gStringVar4
ldr r1, =gText_MysteryGiftBerryObtained
_08153B74:
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r7, 0x6C]
bl IsEnigmaBerryValid
cmp r0, 0x1
bne _08153B9C
ldr r0, =0x0000402d
movs r1, 0x1
bl VarSet
b _08153BA0
.pool
_08153B9C:
movs r0, 0x1
str r0, [r7, 0x6C]
_08153BA0:
movs r0, 0
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8153AE8
thumb_func_start sub_8153BB0
sub_8153BB0: @ 8153BB0
push {r4,lr}
adds r4, r0, 0
ldr r2, [r4, 0x8]
ldrb r0, [r2]
adds r2, 0x1
str r2, [r4, 0x8]
ldrb r1, [r2]
adds r2, 0x1
str r2, [r4, 0x8]
bl GiveGiftRibbonToParty
ldr r0, =gStringVar4
ldr r1, =gText_MysteryGiftSpecialRibbon
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_8153BB0
thumb_func_start sub_8153BE4
sub_8153BE4: @ 8153BE4
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
sub sp, 0x4
adds r4, r0, 0
ldr r0, [r4, 0x8]
ldrb r1, [r0]
mov r9, r1
adds r0, 0x1
str r0, [r4, 0x8]
ldrb r1, [r0]
mov r8, r1
adds r1, r0, 0x1
str r1, [r4, 0x8]
ldrb r6, [r0, 0x1]
adds r1, 0x1
str r1, [r4, 0x8]
adds r0, r4, 0
bl ScriptReadWord
adds r5, r0, 0
ldr r0, [r4, 0x68]
subs r5, r0
ldr r0, [r4, 0x64]
adds r5, r0
adds r0, r4, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r4, 0x68]
subs r1, r0
ldr r0, [r4, 0x64]
adds r1, r0
subs r1, r5
lsls r1, 16
lsrs r1, 16
str r6, [sp]
adds r0, r5, 0
mov r2, r9
mov r3, r8
bl InitRamScript
movs r0, 0
add sp, 0x4
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8153BE4
thumb_func_start sub_8153C4C
sub_8153C4C: @ 8153C4C
push {r4,lr}
adds r4, r0, 0
bl EnableNationalPokedex
ldr r0, =gStringVar4
ldr r1, =gText_MysteryGiftNationalDex
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_8153C4C
thumb_func_start sub_8153C70
sub_8153C70: @ 8153C70
push {r4,lr}
adds r4, r0, 0
ldr r1, [r4, 0x8]
ldrb r0, [r1]
adds r1, 0x1
str r1, [r4, 0x8]
bl sub_811EFC0
ldr r0, =gStringVar4
ldr r1, =gText_MysteryGiftRareWord
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_8153C70
thumb_func_start sub_8153C9C
sub_8153C9C: @ 8153C9C
push {r4,r5,lr}
ldr r1, [r0, 0x8]
ldrb r5, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
bl ScriptReadHalfword
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
adds r0, r5, 0
adds r1, r4, 0
bl sub_8153970
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_8153C9C
thumb_func_start sub_8153CC8
sub_8153CC8: @ 8153CC8
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x88
adds r6, r0, 0
bl ScriptReadWord
ldr r1, [r6, 0x68]
subs r0, r1
ldr r1, [r6, 0x64]
adds r5, r0, r1
movs r0, 0x64
adds r0, r5
mov r8, r0
add r4, sp, 0x24
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x64
bl memcpy
adds r0, r4, 0
movs r1, 0x41
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
bne _08153D18
ldr r0, =gStringVar1
ldr r1, =gText_EggNickname
movs r2, 0xB
bl StringCopyN
b _08153D22
.pool
_08153D18:
ldr r0, =gStringVar1
ldr r1, =gText_Pokemon
movs r2, 0xB
bl StringCopyN
_08153D22:
ldr r0, =gPlayerPartyCount
ldrb r0, [r0]
cmp r0, 0x6
bne _08153D4C
ldr r0, =gStringVar4
ldr r1, =gText_MysteryGiftFullParty
bl StringExpandPlaceholders
movs r0, 0x3
b _08153DB6
.pool
_08153D4C:
ldr r7, =gPlayerParty + 500
adds r0, r7, 0
adds r1, r5, 0
movs r2, 0x64
bl memcpy
mov r0, sp
mov r1, r8
movs r2, 0x24
bl memcpy
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
beq _08153D86
adds r0, r4, 0
bl SpeciesToNationalPokedexNum
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x2
bl GetSetPokedexFlag
adds r0, r4, 0
movs r1, 0x3
bl GetSetPokedexFlag
_08153D86:
adds r0, r7, 0
movs r1, 0xC
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl ItemIsMail
lsls r0, 24
cmp r0, 0
beq _08153DA4
adds r0, r7, 0
mov r1, sp
bl GiveMailToMon2
_08153DA4:
bl CompactPartySlots
bl CalculatePlayerPartyCount
ldr r0, =gStringVar4
ldr r1, =gText_MysteryGiftSentOver
bl StringExpandPlaceholders
movs r0, 0x2
_08153DB6:
str r0, [r6, 0x6C]
movs r0, 0
add sp, 0x88
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_8153CC8
thumb_func_start sub_8153DD4
sub_8153DD4: @ 8153DD4
push {r4,lr}
adds r4, r0, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r4, 0x68]
subs r1, r0
ldr r0, [r4, 0x64]
adds r1, r0
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000bec
adds r0, r2
movs r2, 0xBC
bl memcpy
bl sub_81652B4
ldr r0, =gStringVar4
ldr r1, =gText_MysteryGiftNewTrainer
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_8153DD4
thumb_func_start sub_8153E1C
sub_8153E1C: @ 8153E1C
push {r4,lr}
adds r4, r0, 0
bl EnableResetRTC
ldr r0, =gStringVar4
ldr r1, =gText_InGameClockUsable
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]
movs r0, 0
pop {r4}
pop {r1}
bx r1
.pool
thumb_func_end sub_8153E1C
thumb_func_start sub_8153E40
sub_8153E40: @ 8153E40
push {r4-r6,lr}
adds r6, r0, 0
bl ScriptReadWord
adds r5, r0, 0
adds r0, r6, 0
bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r6, 0x68]
subs r4, r0
ldr r0, [r6, 0x64]
adds r4, r0
adds r0, r6, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r6, 0x68]
subs r1, r0
ldr r0, [r6, 0x64]
adds r1, r0
subs r1, r4
adds r0, r4, 0
bl CalcByteArraySum
cmp r5, r0
beq _08153E7E
movs r0, 0
str r0, [r6, 0x70]
movs r0, 0x1
str r0, [r6, 0x6C]
_08153E7E:
movs r0, 0x1
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8153E40
thumb_func_start sub_8153E88
sub_8153E88: @ 8153E88
push {r4-r6,lr}
adds r6, r0, 0
bl ScriptReadWord
adds r5, r0, 0
adds r0, r6, 0
bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r6, 0x68]
subs r4, r0
ldr r0, [r6, 0x64]
adds r4, r0
adds r0, r6, 0
bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r6, 0x68]
subs r1, r0
ldr r0, [r6, 0x64]
adds r1, r0
subs r1, r4
adds r0, r4, 0
bl CalcCRC16
lsls r0, 16
lsrs r0, 16
cmp r5, r0
beq _08153ECA
movs r0, 0
str r0, [r6, 0x70]
movs r0, 0x1
str r0, [r6, 0x6C]
_08153ECA:
movs r0, 0x1
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8153E88
.align 2, 0 @ Don't pad with nop.
asm/new_menu_helpers.s
Executable → Regular
View File
asm/option_menu.s
-1684
View File
File diff suppressed because it is too large Load Diff
asm/overworld.s
+10 -10
View File
@@ -3055,9 +3055,9 @@ _08085E18:
.pool .pool
thumb_func_end c1_overworld thumb_func_end c1_overworld
thumb_func_start c2_overworld_basic thumb_func_start OverworldBasic
@ void c2_overworld_basic() @ void OverworldBasic()
c2_overworld_basic: @ 8085E24 OverworldBasic: @ 8085E24
push {lr} push {lr}
bl ScriptContext2_RunScript bl ScriptContext2_RunScript
bl RunTasks bl RunTasks
@@ -3070,15 +3070,15 @@ c2_overworld_basic: @ 8085E24
bl do_scheduled_bg_tilemap_copies_to_vram bl do_scheduled_bg_tilemap_copies_to_vram
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end c2_overworld_basic thumb_func_end OverworldBasic
thumb_func_start sub_8085E50 thumb_func_start CB2_OverworldBasic
sub_8085E50: @ 8085E50 CB2_OverworldBasic: @ 8085E50
push {lr} push {lr}
bl c2_overworld_basic bl OverworldBasic
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8085E50 thumb_func_end CB2_OverworldBasic
thumb_func_start c2_overworld thumb_func_start c2_overworld
c2_overworld: @ 8085E5C c2_overworld: @ 8085E5C
@@ -3092,7 +3092,7 @@ c2_overworld: @ 8085E5C
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
_08085E70: _08085E70:
bl c2_overworld_basic bl OverworldBasic
cmp r4, 0 cmp r4, 0
beq _08085E7C beq _08085E7C
bl SetFieldVBlankCallback bl SetFieldVBlankCallback
@@ -4122,7 +4122,7 @@ sub_80867D8: @ 80867D8
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl SetGpuReg bl SetGpuReg
bl remove_some_task bl ScanlineEffect_Stop
ldr r2, =0x05000002 ldr r2, =0x05000002
mov r1, sp mov r1, sp
movs r0, 0 movs r0, 0
asm/party_menu.s
Executable → Regular
+10 -10
View File
@@ -107,7 +107,7 @@ _081B0290:
b _081B048C b _081B048C
.pool .pool
_081B02AC: _081B02AC:
bl remove_some_task bl ScanlineEffect_Stop
b _081B0484 b _081B0484
_081B02B2: _081B02B2:
bl ResetPaletteFade bl ResetPaletteFade
@@ -10645,7 +10645,7 @@ party_menu_held_item_object: @ 81B5C14
bl GetMonData bl GetMonData
cmp r0, 0 cmp r0, 0
beq _081B5C3C beq _081B5C3C
ldr r0, =gUnknown_08615EC0 ldr r0, =gSpriteTemplate_8615EC0
ldr r2, [r4, 0x4] ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x2] ldrb r1, [r2, 0x2]
ldrb r2, [r2, 0x3] ldrb r2, [r2, 0x3]
@@ -10671,7 +10671,7 @@ party_menu_link_mon_held_item_object: @ 81B5C48
lsrs r5, r1, 16 lsrs r5, r1, 16
cmp r0, 0 cmp r0, 0
beq _081B5C84 beq _081B5C84
ldr r0, =gUnknown_08615EC0 ldr r0, =gSpriteTemplate_8615EC0
ldr r2, [r4, 0x4] ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x2] ldrb r1, [r2, 0x2]
ldrb r2, [r2, 0x3] ldrb r2, [r2, 0x3]
@@ -10896,7 +10896,7 @@ sub_81B5DF0: @ 81B5DF0
add r0, r8 add r0, r8
adds r0, 0x43 adds r0, 0x43
ldrb r3, [r0] ldrb r3, [r0]
ldr r0, =gUnknown_08615EC0 ldr r0, =gSpriteTemplate_8615EC0
subs r3, 0x1 subs r3, 0x1
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
@@ -10991,7 +10991,7 @@ party_menu_pokeball_object: @ 81B5ECC
bl GetMonData bl GetMonData
cmp r0, 0 cmp r0, 0
beq _081B5EEA beq _081B5EEA
ldr r0, =gUnknown_08615F08 ldr r0, =gSpriteTemplate_8615F08
ldr r2, [r4, 0x4] ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x6] ldrb r1, [r2, 0x6]
ldrb r2, [r2, 0x7] ldrb r2, [r2, 0x7]
@@ -11012,7 +11012,7 @@ party_menu_link_mon_pokeball_object: @ 81B5EF4
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _081B5F24 beq _081B5F24
ldr r0, =gUnknown_08615F08 ldr r0, =gSpriteTemplate_8615F08
ldr r2, [r4, 0x4] ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x6] ldrb r1, [r2, 0x6]
ldrb r2, [r2, 0x7] ldrb r2, [r2, 0x7]
@@ -11046,7 +11046,7 @@ sub_81B5F34: @ 81B5F34
lsrs r3, 24 lsrs r3, 24
lsls r2, 24 lsls r2, 24
lsrs r2, 24 lsrs r2, 24
ldr r0, =gUnknown_08615F08 ldr r0, =gSpriteTemplate_8615F08
adds r1, r3, 0 adds r1, r3, 0
movs r3, 0x8 movs r3, 0x8
bl CreateSprite bl CreateSprite
@@ -11078,7 +11078,7 @@ sub_81B5F74: @ 81B5F74
lsrs r3, 24 lsrs r3, 24
lsls r2, 24 lsls r2, 24
lsrs r2, 24 lsrs r2, 24
ldr r0, =gUnknown_08615F78 ldr r0, =gSpriteTemplate_8615F78
adds r1, r3, 0 adds r1, r3, 0
movs r3, 0x8 movs r3, 0x8
bl CreateSprite bl CreateSprite
@@ -11194,7 +11194,7 @@ party_menu_status_condition_object: @ 81B6064
bl GetMonData bl GetMonData
cmp r0, 0 cmp r0, 0
beq _081B608C beq _081B608C
ldr r0, =gUnknown_08616008 ldr r0, =gSpriteTemplate_8616008
ldr r2, [r4, 0x4] ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x4] ldrb r1, [r2, 0x4]
ldrb r2, [r2, 0x5] ldrb r2, [r2, 0x5]
@@ -11220,7 +11220,7 @@ party_menu_link_mon_status_condition_object: @ 81B6098
lsrs r5, r1, 24 lsrs r5, r1, 24
cmp r0, 0 cmp r0, 0
beq _081B60D4 beq _081B60D4
ldr r0, =gUnknown_08616008 ldr r0, =gSpriteTemplate_8616008
ldr r2, [r4, 0x4] ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x4] ldrb r1, [r2, 0x4]
ldrb r2, [r2, 0x5] ldrb r2, [r2, 0x5]
asm/pokedex.s
+2 -2
View File
@@ -379,7 +379,7 @@ _080BB582:
b _080BB74C b _080BB74C
.pool .pool
_080BB5FC: _080BB5FC:
bl remove_some_task bl ScanlineEffect_Stop
bl ResetTasks bl ResetTasks
bl ResetSpriteData bl ResetSpriteData
bl ResetPaletteFade bl ResetPaletteFade
@@ -8940,7 +8940,7 @@ _080C0250:
b _080C028E b _080C028E
.pool .pool
_080C028C: _080C028C:
ldr r0, =gUnknown_0856E688 ldr r0, =sText_TenDashes2
_080C028E: _080C028E:
movs r1, 0x84 movs r1, 0x84
movs r2, 0x19 movs r2, 0x19
asm/pokemon_icon.s
Executable → Regular
View File
asm/pokemon_storage_system.s
Executable → Regular
+11 -11
View File
@@ -5393,7 +5393,7 @@ _080CA0C2:
thumb_func_start sub_80CA0C8 thumb_func_start sub_80CA0C8
sub_80CA0C8: @ 80CA0C8 sub_80CA0C8: @ 80CA0C8
push {lr} push {lr}
ldr r0, =gUnknown_08572744 ldr r0, =gWaveformSpritePalette
bl LoadSpritePalette bl LoadSpritePalette
pop {r0} pop {r0}
bx r0 bx r0
@@ -5498,7 +5498,7 @@ sub_80CA154: @ 80CA154
sub_80CA1C4: @ 80CA1C4 sub_80CA1C4: @ 80CA1C4
push {r4,lr} push {r4,lr}
sub sp, 0x8 sub sp, 0x8
ldr r0, =gUnknown_0857274C ldr r0, =gWaveformSpriteSheet
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
ldr r0, [r0] ldr r0, [r0]
str r0, [sp] str r0, [sp]
@@ -10135,7 +10135,7 @@ _080CC7E6:
lsls r0, r1, 1 lsls r0, r1, 1
adds r0, r1 adds r0, r1
lsls r0, 2 lsls r0, 2
ldr r1, =gUnknown_085775B8 ldr r1, =gWallpaperTable
adds r6, r0, r1 adds r6, r0, r1
ldr r0, [r6, 0x4] ldr r0, [r6, 0x4]
ldr r1, [r7] ldr r1, [r7]
@@ -10646,7 +10646,7 @@ _080CCC70:
adds r1, r6, r1 adds r1, r6, r1
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
ldr r0, =gUnknown_0857B0A8 ldr r0, =gSpriteTemplate_857B0A8
movs r2, 0x1C movs r2, 0x1C
movs r3, 0x18 movs r3, 0x18
bl CreateSprite bl CreateSprite
@@ -10720,7 +10720,7 @@ sub_80CCCFC: @ 80CCCFC
ldr r0, =0x00030200 ldr r0, =0x00030200
str r0, [r3, 0x4] str r0, [r3, 0x4]
add r1, sp, 0x4 add r1, sp, 0x4
ldr r0, =gUnknown_0857B0A8 ldr r0, =gSpriteTemplate_857B0A8
ldm r0!, {r5-r7} ldm r0!, {r5-r7}
stm r1!, {r5-r7} stm r1!, {r5-r7}
ldm r0!, {r5-r7} ldm r0!, {r5-r7}
@@ -16240,14 +16240,14 @@ sub_80CFC14: @ 80CFC14
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x2C sub sp, 0x2C
mov r1, sp mov r1, sp
ldr r0, =gUnknown_0857B9E4 ldr r0, =gHandCursorSpriteSheets
ldm r0!, {r2-r4} ldm r0!, {r2-r4}
stm r1!, {r2-r4} stm r1!, {r2-r4}
ldm r0!, {r2,r3,r5} ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5} stm r1!, {r2,r3,r5}
add r4, sp, 0x18 add r4, sp, 0x18
adds r1, r4, 0 adds r1, r4, 0
ldr r0, =gUnknown_0857B9FC ldr r0, =gHandCursorSpritePalettes
ldm r0!, {r2,r3,r5} ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5} stm r1!, {r2,r3,r5}
ldr r0, [r0] ldr r0, [r0]
@@ -16279,7 +16279,7 @@ sub_80CFC14: @ 80CFC14
adds r2, r4, 0 adds r2, r4, 0
adds r3, r5, 0 adds r3, r5, 0
bl sub_80CD444 bl sub_80CD444
ldr r0, =gUnknown_0857BA50 ldr r0, =gSpriteTemplate_857BA50
movs r2, 0 movs r2, 0
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
movs r3, 0 movs r3, 0
@@ -16353,7 +16353,7 @@ _080CFD3C:
movs r3, 0x15 movs r3, 0x15
movs r4, 0x2 movs r4, 0x2
_080CFD40: _080CFD40:
ldr r0, =gUnknown_0857BA68 ldr r0, =gSpriteTemplate_857BA68
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl CreateSprite bl CreateSprite
@@ -18324,7 +18324,7 @@ sub_80D0C60: @ 80D0C60
orrs r0, r1 orrs r0, r1
str r0, [r2, 0x4] str r0, [r2, 0x4]
mov r1, sp mov r1, sp
ldr r0, =gUnknown_0857BC70 ldr r0, =gSpriteTemplate_857BC70
ldm r0!, {r4-r6} ldm r0!, {r4-r6}
stm r1!, {r4-r6} stm r1!, {r4-r6}
ldm r0!, {r4-r6} ldm r0!, {r4-r6}
@@ -21660,7 +21660,7 @@ sub_80D2644: @ 80D2644
mov r2, r9 mov r2, r9
ldr r1, [r2] ldr r1, [r2]
adds r5, r1 adds r5, r1
ldr r2, =gUnknown_0857BC88 ldr r2, =gSpriteTemplate_857BC88
lsls r4, 2 lsls r4, 2
lsls r1, r0, 4 lsls r1, r0, 4
adds r4, r1 adds r4, r1
asm/pokemon_summary_screen.s
Executable → Regular
+1 -1
View File
@@ -2239,7 +2239,7 @@ _081C50E4:
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
b _081C51A2 b _081C51A2
_081C50EE: _081C50EE:
bl remove_some_task bl ScanlineEffect_Stop
b _081C51A2 b _081C51A2
_081C50F4: _081C50F4:
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
asm/pokenav.s
Executable → Regular
+7 -7
View File
@@ -6948,7 +6948,7 @@ sub_81CA818: @ 81CA818
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r5, =gUnknown_0861FC7A ldr r5, =gUnknown_0861FC78 + 2
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
adds r2, r5, 0 adds r2, r5, 0
@@ -6967,7 +6967,7 @@ sub_81CA818: @ 81CA818
thumb_func_start sub_81CA850 thumb_func_start sub_81CA850
sub_81CA850: @ 81CA850 sub_81CA850: @ 81CA850
push {lr} push {lr}
ldr r0, =gUnknown_0861FC86 ldr r0, =gUnknown_0861FC78 + 0xE
movs r1, 0x31 movs r1, 0x31
movs r2, 0x4 movs r2, 0x4
bl sub_81C7944 bl sub_81C7944
@@ -6985,7 +6985,7 @@ sub_81CA864: @ 81CA864
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r5, =gUnknown_0861FC86 ldr r5, =gUnknown_0861FC78 + 0xE
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
adds r2, r5, 0 adds r2, r5, 0
@@ -7095,7 +7095,7 @@ titlescreen_0: @ 81CA92C
movs r0, 0x44 movs r0, 0x44
movs r1, 0xA0 movs r1, 0xA0
bl SetGpuRegBits bl SetGpuRegBits
bl remove_some_task bl ScanlineEffect_Stop
bl sub_81CAA3C bl sub_81CAA3C
ldr r2, =gUnknown_08620384 ldr r2, =gUnknown_08620384
ldr r0, [r2] ldr r0, [r2]
@@ -7122,7 +7122,7 @@ sub_81CA994: @ 81CA994
lsls r1, 6 lsls r1, 6
movs r0, 0 movs r0, 0
bl ClearGpuRegBits bl ClearGpuRegBits
bl remove_some_task bl ScanlineEffect_Stop
ldr r0, =sub_81CA9EC ldr r0, =sub_81CA9EC
bl FindTaskIdByFunc bl FindTaskIdByFunc
lsls r0, 24 lsls r0, 24
@@ -26754,7 +26754,7 @@ _081D4368:
b _081D449E b _081D449E
_081D4394: _081D4394:
movs r3, 0 movs r3, 0
ldr r1, =gUnknown_0862608E ldr r1, =gUnknown_0862608C + 2
adds r0, r7, r1 adds r0, r7, r1
movs r2, 0x16 movs r2, 0x16
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
@@ -26887,7 +26887,7 @@ _081D449E:
mov r3, r10 mov r3, r10
adds r4, r0, r3 adds r4, r0, r3
ldr r6, =gUnknown_0862608C ldr r6, =gUnknown_0862608C
ldr r1, =gUnknown_0862608E ldr r1, =gUnknown_0862608C + 2
adds r0, r7, r1 adds r0, r7, r1
movs r3, 0x16 movs r3, 0x16
ldrsh r1, [r4, r3] ldrsh r1, [r4, r3]
asm/rayquaza_scene.s
Executable → Regular
+3 -3
View File
@@ -45,7 +45,7 @@ sub_81D6774: @ 81D6774
push {lr} push {lr}
bl SetVBlankHBlankCallbacksToNull bl SetVBlankHBlankCallbacksToNull
bl clear_scheduled_bg_copies_to_vram bl clear_scheduled_bg_copies_to_vram
bl remove_some_task bl ScanlineEffect_Stop
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
bl ResetPaletteFade bl ResetPaletteFade
bl ResetSpriteData bl ResetSpriteData
@@ -1522,7 +1522,7 @@ _081D73D8:
adds r0, r2 adds r0, r2
ldrh r1, [r4, 0x6] ldrh r1, [r4, 0x6]
strh r1, [r0, 0xE] strh r1, [r0, 0xE]
bl remove_some_task bl ScanlineEffect_Stop
_081D7428: _081D7428:
ldrh r0, [r4] ldrh r0, [r4]
adds r0, 0x1 adds r0, 0x1
@@ -1774,7 +1774,7 @@ sub_81D7600: @ 81D7600
bl ChangeBgY bl ChangeBgY
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
bl remove_some_task bl ScanlineEffect_Stop
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
strh r4, [r5] strh r4, [r5]
asm/record_mixing.s
+3 -3
View File
@@ -114,7 +114,7 @@ sub_80E6CA0: @ 80E6CA0
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E6D1C bne _080E6D1C
bl sub_81539D4 bl GetRecordMixingGift
ldr r2, =0x000011c8 ldr r2, =0x000011c8
adds r1, r5, r2 adds r1, r5, r2
strh r0, [r1] strh r0, [r1]
@@ -186,7 +186,7 @@ sub_80E6D54: @ 80E6D54
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E6DEE bne _080E6DEE
bl sub_81539D4 bl GetRecordMixingGift
ldr r2, =0x000011c8 ldr r2, =0x000011c8
adds r1, r5, r2 adds r1, r5, r2
strh r0, [r1] strh r0, [r1]
@@ -282,7 +282,7 @@ _080E6E60:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E6EFA bne _080E6EFA
bl sub_81539D4 bl GetRecordMixingGift
ldr r1, [r5] ldr r1, [r5]
ldr r2, =0x00001210 ldr r2, =0x00001210
adds r1, r2 adds r1, r2
asm/reset_rtc_screen.s
+1 -1
View File
@@ -887,7 +887,7 @@ _0809EFCA:
movs r1, 0x80 movs r1, 0x80
bl ResetOamRange bl ResetOamRange
bl LoadOam bl LoadOam
bl remove_some_task bl ScanlineEffect_Stop
bl dp12_8087EA4 bl dp12_8087EA4
bl ResetSpriteData bl ResetSpriteData
bl ResetTasks bl ResetTasks
asm/roulette.s
+1 -1
View File
@@ -423,7 +423,7 @@ _081405F4:
_08140618: _08140618:
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
bl remove_some_task bl ScanlineEffect_Stop
bl SetVBlankHBlankCallbacksToNull bl SetVBlankHBlankCallbacksToNull
bl ResetVramOamAndBgCntRegs bl ResetVramOamAndBgCntRegs
bl ResetAllBgsCoordinates bl ResetAllBgsCoordinates
asm/script_menu.s
+7 -7
View File
@@ -676,9 +676,9 @@ _080E2360:
.pool .pool
thumb_func_end sub_80E2308 thumb_func_end sub_80E2308
thumb_func_start sp109_CreatePCMenu thumb_func_start ScrSpecial_CreatePCMenu
@ bool sp109_CreatePCMenu() @ bool ScrSpecial_CreatePCMenu()
sp109_CreatePCMenu: @ 80E236C ScrSpecial_CreatePCMenu: @ 80E236C
push {lr} push {lr}
ldr r0, =sub_80E2058 ldr r0, =sub_80E2058
bl FuncIsActiveTask bl FuncIsActiveTask
@@ -698,7 +698,7 @@ _080E2394:
_080E2396: _080E2396:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sp109_CreatePCMenu thumb_func_end ScrSpecial_CreatePCMenu
thumb_func_start CreatePCMenu thumb_func_start CreatePCMenu
CreatePCMenu: @ 80E239C CreatePCMenu: @ 80E239C
@@ -858,8 +858,8 @@ _080E24C6:
.pool .pool
thumb_func_end CreatePCMenu thumb_func_end CreatePCMenu
thumb_func_start sub_80E2514 thumb_func_start ScriptMenu_DisplayPCStartupPrompt
sub_80E2514: @ 80E2514 ScriptMenu_DisplayPCStartupPrompt: @ 80E2514
push {lr} push {lr}
sub sp, 0x10 sub sp, 0x10
movs r0, 0 movs r0, 0
@@ -882,7 +882,7 @@ sub_80E2514: @ 80E2514
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80E2514 thumb_func_end ScriptMenu_DisplayPCStartupPrompt
thumb_func_start sub_80E2548 thumb_func_start sub_80E2548
sub_80E2548: @ 80E2548 sub_80E2548: @ 80E2548
asm/script_movement.s
Executable → Regular
View File
asm/shop.s
+1 -1
View File
@@ -448,7 +448,7 @@ _080DFE20:
ldr r2, =0x01000100 ldr r2, =0x01000100
add r0, sp, 0x8 add r0, sp, 0x8
bl CpuFastSet bl CpuFastSet
bl remove_some_task bl ScanlineEffect_Stop
bl reset_temp_tile_data_buffers bl reset_temp_tile_data_buffers
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
bl ResetPaletteFade bl ResetPaletteFade
asm/smokescreen.s
Executable → Regular
View File
asm/start_menu.s
+2 -2
View File
@@ -653,7 +653,7 @@ _0809FD38:
bl play_some_sound bl play_some_sound
bl RemoveExtraStartMenuWindows bl RemoveExtraStartMenuWindows
bl overworld_free_bg_tilemaps bl overworld_free_bg_tilemaps
ldr r0, =CB2_OptionsMenu ldr r0, =CB2_InitOptionMenu
bl SetMainCallback2 bl SetMainCallback2
ldr r1, =gMain ldr r1, =gMain
ldr r0, =sub_8086194 ldr r0, =sub_8086194
@@ -1510,7 +1510,7 @@ _080A0418:
bl SetGpuReg bl SetGpuReg
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
bl remove_some_task bl ScanlineEffect_Stop
movs r2, 0xA0 movs r2, 0xA0
lsls r2, 19 lsls r2, 19
mov r1, sp mov r1, sp
asm/title_screen.s
+1 -1
View File
@@ -614,7 +614,7 @@ _080AA8C4:
ldr r0, =gUnknown_08DDE458 ldr r0, =gUnknown_08DDE458
ldr r1, =0x0600d800 ldr r1, =0x0600d800
bl LZ77UnCompVram bl LZ77UnCompVram
bl remove_some_task bl ScanlineEffect_Stop
bl ResetTasks bl ResetTasks
bl ResetSpriteData bl ResetSpriteData
bl FreeAllSpritePalettes bl FreeAllSpritePalettes
asm/trade.s
+44 -44
View File
@@ -826,7 +826,7 @@ _080778CA:
adds r4, 0x10 adds r4, 0x10
_080778DE: _080778DE:
add r1, sp, 0x10 add r1, sp, 0x10
ldr r0, =gUnknown_0832DCAC ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7} stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
@@ -863,7 +863,7 @@ _080778DE:
adds r4, 0x88 adds r4, 0x88
_0807792C: _0807792C:
add r1, sp, 0x10 add r1, sp, 0x10
ldr r0, =gUnknown_0832DCAC ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7} stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
@@ -889,7 +889,7 @@ _0807792C:
b _08077B22 b _08077B22
.pool .pool
_08077970: _08077970:
ldr r4, =gUnknown_0832DCAC ldr r4, =gSpriteTemplate_832DCAC
add r1, sp, 0x10 add r1, sp, 0x10
adds r0, r4, 0 adds r0, r4, 0
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
@@ -927,7 +927,7 @@ _08077970:
lsls r5, 13 lsls r5, 13
_080779BC: _080779BC:
add r1, sp, 0x10 add r1, sp, 0x10
ldr r0, =gUnknown_0832DCAC ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7} stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
@@ -948,7 +948,7 @@ _080779BC:
adds r6, 0x1 adds r6, 0x1
cmp r6, 0x5 cmp r6, 0x5
ble _080779BC ble _080779BC
ldr r0, =gUnknown_0832DC94 ldr r0, =gSpriteTemplate_832DC94
ldr r2, =gUnknown_0832DE24 ldr r2, =gUnknown_0832DE24
ldrb r1, [r2] ldrb r1, [r2]
lsls r1, 19 lsls r1, 19
@@ -1450,7 +1450,7 @@ _08077EA0:
adds r4, 0x10 adds r4, 0x10
_08077EB4: _08077EB4:
add r1, sp, 0xC add r1, sp, 0xC
ldr r0, =gUnknown_0832DCAC ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7} stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
@@ -1487,7 +1487,7 @@ _08077EB4:
adds r4, 0x88 adds r4, 0x88
_08077F02: _08077F02:
add r1, sp, 0xC add r1, sp, 0xC
ldr r0, =gUnknown_0832DCAC ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7} stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
@@ -1513,7 +1513,7 @@ _08077F02:
b _080780D8 b _080780D8
.pool .pool
_08077F48: _08077F48:
ldr r4, =gUnknown_0832DCAC ldr r4, =gSpriteTemplate_832DCAC
add r1, sp, 0xC add r1, sp, 0xC
adds r0, r4, 0 adds r0, r4, 0
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
@@ -1551,7 +1551,7 @@ _08077F48:
lsls r5, 13 lsls r5, 13
_08077F94: _08077F94:
add r1, sp, 0xC add r1, sp, 0xC
ldr r0, =gUnknown_0832DCAC ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7} stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7} ldm r0!, {r2,r3,r7}
@@ -1590,7 +1590,7 @@ _08077FE4:
adds r0, 0x6 adds r0, 0x6
_08077FEA: _08077FEA:
strb r0, [r2] strb r0, [r2]
ldr r0, =gUnknown_0832DC94 ldr r0, =gSpriteTemplate_832DC94
ldr r3, =gUnknown_0832DE24 ldr r3, =gUnknown_0832DE24
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x35 adds r1, 0x35
@@ -1931,7 +1931,7 @@ _080782D4:
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl CopyToBgTilemapBufferRect_ChangePalette bl CopyToBgTilemapBufferRect_ChangePalette
ldr r1, =gUnknown_0832CABC ldr r1, =gTradeStripesBG2Tilemap
movs r2, 0x80 movs r2, 0x80
lsls r2, 4 lsls r2, 4
movs r0, 0x2 movs r0, 0x2
@@ -1940,7 +1940,7 @@ _080782D4:
b _0807837E b _0807837E
.pool .pool
_08078324: _08078324:
ldr r1, =gUnknown_0832D2BC ldr r1, =gTradeStripesBG3Tilemap
movs r2, 0x80 movs r2, 0x80
lsls r2, 4 lsls r2, 4
movs r0, 0x3 movs r0, 0x3
@@ -2394,7 +2394,7 @@ _08078726:
mov r2, sp mov r2, sp
bl GetMonData bl GetMonData
mov r0, sp mov r0, sp
ldr r1, =gUnknown_0832DF94 ldr r1, =gJPText_Shedinja
bl StringCompareWithoutExtCtrlCodes bl StringCompareWithoutExtCtrlCodes
cmp r0, 0 cmp r0, 0
bne _08078766 bne _08078766
@@ -2444,7 +2444,7 @@ _080787AC:
thumb_func_start sub_80787B8 thumb_func_start sub_80787B8
sub_80787B8: @ 80787B8 sub_80787B8: @ 80787B8
push {lr} push {lr}
ldr r0, =gUnknown_0832DAE5 ldr r0, =gText_IsThisTradeOkay
ldr r1, =gUnknown_0203229C ldr r1, =gUnknown_0203229C
ldr r1, [r1] ldr r1, [r1]
adds r1, 0x72 adds r1, 0x72
@@ -4438,7 +4438,7 @@ _08079772:
lsls r0, 2 lsls r0, 2
add r0, r8 add r0, r8
bl sub_80A6DEC bl sub_80A6DEC
ldr r1, =gUnknown_0832C8BE ldr r1, =gTradePartyBoxTilemap
ldr r0, [sp, 0x64] ldr r0, [sp, 0x64]
subs r2, r0, r7 subs r2, r0, r7
lsls r2, 24 lsls r2, 24
@@ -4491,7 +4491,7 @@ _080798AC:
b _08079A24 b _08079A24
.pool .pool
_080798BC: _080798BC:
ldr r1, =gUnknown_0832C6C0 ldr r1, =gTradeMovesBoxTilemap
ldr r0, [sp, 0x60] ldr r0, [sp, 0x60]
lsls r2, r0, 4 lsls r2, r0, 4
subs r2, r0 subs r2, r0
@@ -4769,7 +4769,7 @@ _08079AFE:
lsrs r4, r0, 16 lsrs r4, r0, 16
cmp r4, 0x3 cmp r4, 0x3
bls _08079ADE bls _08079ADE
ldr r1, =gUnknown_0832DABC ldr r1, =gText_EmptyString7
adds r0, r6, 0 adds r0, r6, 0
bl StringCopy bl StringCopy
movs r4, 0 movs r4, 0
@@ -4789,7 +4789,7 @@ _08079B20:
bl StringAppend bl StringAppend
_08079B3C: _08079B3C:
adds r0, r6, 0 adds r0, r6, 0
ldr r1, =gUnknown_0832DAD2 ldr r1, =gText_NewLine3
bl StringAppend bl StringAppend
adds r0, r4, 0x1 adds r0, r4, 0x1
lsls r0, 16 lsls r0, 16
@@ -4799,10 +4799,10 @@ _08079B3C:
b _08079B6C b _08079B6C
.pool .pool
_08079B5C: _08079B5C:
ldr r1, =gUnknown_0832DABC ldr r1, =gText_EmptyString7
adds r0, r6, 0 adds r0, r6, 0
bl StringCopy bl StringCopy
ldr r1, =gUnknown_0832DADF ldr r1, =gText_FourQuestionMarks
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
_08079B6C: _08079B6C:
@@ -5326,7 +5326,7 @@ sub_8079F88: @ 8079F88
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r1, =gUnknown_0832C8BE ldr r1, =gTradePartyBoxTilemap
lsls r2, r4, 4 lsls r2, r4, 4
subs r2, r4 subs r2, r4
lsls r2, 24 lsls r2, 24
@@ -5698,7 +5698,7 @@ _0807A2B8:
mov r0, sp mov r0, sp
b _0807A2D6 b _0807A2D6
_0807A2BC: _0807A2BC:
ldr r0, =gUnknown_0832DCE4 ldr r0, =gSpritePalette_TradeScreenText
bl LoadSpritePalette bl LoadSpritePalette
b _0807A2DA b _0807A2DA
.pool .pool
@@ -8571,7 +8571,7 @@ _0807BB68:
lsls r4, r0, 4 lsls r4, r0, 4
subs r4, r0 subs r4, r0
lsls r4, 2 lsls r4, 2
ldr r0, =gUnknown_08338ED0 ldr r0, =gIngameTrades
adds r4, r0 adds r4, r0
ldr r0, =gStringVar1 ldr r0, =gStringVar1
adds r1, r4, 0 adds r1, r4, 0
@@ -9098,7 +9098,7 @@ _0807C1DC:
beq _0807C1FC beq _0807C1FC
bl _0807CFB4 bl _0807CFB4
_0807C1FC: _0807C1FC:
ldr r0, =gUnknown_08338D28 ldr r0, =gSpriteTemplate_8338D28
movs r1, 0x78 movs r1, 0x78
movs r2, 0x20 movs r2, 0x20
movs r3, 0 movs r3, 0
@@ -9228,7 +9228,7 @@ _0807C318:
bl _0807CFB4 bl _0807CFB4
_0807C328: _0807C328:
bl sub_807AB28 bl sub_807AB28
ldr r0, =gUnknown_08338E74 ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
@@ -9296,7 +9296,7 @@ _0807C3B0:
beq _0807C3C4 beq _0807C3C4
bl _0807CFB4 bl _0807CFB4
_0807C3C4: _0807C3C4:
ldr r0, =gUnknown_08338DFC ldr r0, =gSpriteTemplate_8338DFC
movs r1, 0x80 movs r1, 0x80
movs r2, 0x41 movs r2, 0x41
movs r3, 0 movs r3, 0
@@ -9316,7 +9316,7 @@ _0807C3E0:
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x90 adds r1, 0x90
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_08338DC8 ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x80 movs r1, 0x80
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
@@ -9455,7 +9455,7 @@ _0807C528:
movs r2, 0x10 movs r2, 0x10
movs r3, 0 movs r3, 0
bl BeginNormalPaletteFade bl BeginNormalPaletteFade
ldr r5, =gUnknown_08338DC8 ldr r5, =gSpriteTemplate_8338DC8
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x6F movs r1, 0x6F
movs r2, 0xAA movs r2, 0xAA
@@ -9604,7 +9604,7 @@ _0807C66C:
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x10 adds r1, 0x10
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_08338ECC ldr r1, =gSpriteAffineAnimTable_8338ECC
str r1, [r0] str r1, [r0]
ldrb r1, [r2] ldrb r1, [r2]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -9915,7 +9915,7 @@ _0807C8FA:
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x90 adds r1, 0x90
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_08338DC8 ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x80 movs r1, 0x80
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0 movs r3, 0
@@ -10091,7 +10091,7 @@ _0807CA86:
bne _0807CA92 bne _0807CA92
b _0807CFB4 b _0807CFB4
_0807CA92: _0807CA92:
ldr r0, =gUnknown_08338DFC ldr r0, =gSpriteTemplate_8338DFC
movs r1, 0x80 movs r1, 0x80
movs r2, 0x41 movs r2, 0x41
movs r3, 0 movs r3, 0
@@ -10113,7 +10113,7 @@ _0807CA92:
b _0807CFB4 b _0807CFB4
.pool .pool
_0807CAC8: _0807CAC8:
ldr r0, =gUnknown_08338E74 ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
@@ -10255,7 +10255,7 @@ _0807CBEC:
b _0807CF48 b _0807CF48
.pool .pool
_0807CBF4: _0807CBF4:
ldr r0, =gUnknown_08338D28 ldr r0, =gSpriteTemplate_8338D28
movs r2, 0x8 movs r2, 0x8
negs r2, r2 negs r2, r2
movs r1, 0x78 movs r1, 0x78
@@ -11160,7 +11160,7 @@ _0807D5B8:
beq _0807D5D8 beq _0807D5D8
bl _0807E400 bl _0807E400
_0807D5D8: _0807D5D8:
ldr r0, =gUnknown_08338D28 ldr r0, =gSpriteTemplate_8338D28
movs r1, 0x78 movs r1, 0x78
movs r2, 0x20 movs r2, 0x20
movs r3, 0 movs r3, 0
@@ -11290,7 +11290,7 @@ _0807D6F4:
_0807D704: _0807D704:
movs r0, 0x3 movs r0, 0x3
bl sub_807B62C bl sub_807B62C
ldr r0, =gUnknown_08338E8C ldr r0, =gSpriteTemplate_8338E8C
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
@@ -11386,7 +11386,7 @@ _0807D7C4:
adds r0, r1 adds r0, r1
ldr r1, =sub_807AA4C ldr r1, =sub_807AA4C
str r1, [r0] str r1, [r0]
ldr r0, =gUnknown_08338DC8 ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
@@ -11524,7 +11524,7 @@ _0807D924:
movs r2, 0x10 movs r2, 0x10
movs r3, 0 movs r3, 0
bl BeginNormalPaletteFade bl BeginNormalPaletteFade
ldr r5, =gUnknown_08338DC8 ldr r5, =gSpriteTemplate_8338DC8
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x6F movs r1, 0x6F
movs r2, 0xAA movs r2, 0xAA
@@ -11678,7 +11678,7 @@ _0807DA74:
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x10 adds r1, 0x10
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_08338ECC ldr r1, =gSpriteAffineAnimTable_8338ECC
str r1, [r0] str r1, [r0]
ldrb r1, [r2] ldrb r1, [r2]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -12008,7 +12008,7 @@ _0807DD02:
adds r0, r1 adds r0, r1
ldr r1, =sub_807AA4C ldr r1, =sub_807AA4C
str r1, [r0] str r1, [r0]
ldr r0, =gUnknown_08338DC8 ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x78 movs r1, 0x78
adds r2, r4, 0 adds r2, r4, 0
movs r3, 0 movs r3, 0
@@ -12218,7 +12218,7 @@ _0807DF12:
strh r6, [r5] strh r6, [r5]
b _0807E398 b _0807E398
_0807DF16: _0807DF16:
ldr r0, =gUnknown_08338E74 ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78 movs r1, 0x78
movs r2, 0x50 movs r2, 0x50
movs r3, 0 movs r3, 0
@@ -12360,7 +12360,7 @@ _0807E038:
b _0807E394 b _0807E394
.pool .pool
_0807E040: _0807E040:
ldr r0, =gUnknown_08338D28 ldr r0, =gSpriteTemplate_8338D28
movs r2, 0x8 movs r2, 0x8
negs r2, r2 negs r2, r2
movs r1, 0x78 movs r1, 0x78
@@ -13184,7 +13184,7 @@ sub_807E73C: @ 807E73C
lsls r4, r0, 4 lsls r4, r0, 4
subs r4, r0 subs r4, r0
lsls r4, 2 lsls r4, 2
ldr r0, =gUnknown_08338ED0 ldr r0, =gIngameTrades
adds r4, r0 adds r4, r0
ldr r0, =gStringVar1 ldr r0, =gStringVar1
ldrh r1, [r4, 0x38] ldrh r1, [r4, 0x38]
@@ -13214,7 +13214,7 @@ sub_807E784: @ 807E784
lsls r4, r0, 4 lsls r4, r0, 4
subs r4, r0 subs r4, r0
lsls r4, 2 lsls r4, 2
ldr r0, =gUnknown_08338ED0 ldr r0, =gIngameTrades
adds r4, r0 adds r4, r0
ldr r0, =gSpecialVar_0x8005 ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0] ldrh r1, [r0]
@@ -13253,7 +13253,7 @@ sub_807E7E8: @ 807E7E8
lsls r2, r1, 4 lsls r2, r1, 4
subs r2, r1 subs r2, r1
lsls r2, 2 lsls r2, 2
ldr r1, =gUnknown_08338ED0 ldr r1, =gIngameTrades
adds r5, r2, r1 adds r5, r2, r1
movs r1, 0x64 movs r1, 0x64
muls r0, r1 muls r0, r1
asm/trainer_card.s
+6 -6
View File
@@ -1556,7 +1556,7 @@ sub_80C3404: @ 80C3404
sub_80C3414: @ 80C3414 sub_80C3414: @ 80C3414
push {lr} push {lr}
bl ResetTasks bl ResetTasks
bl remove_some_task bl ScanlineEffect_Stop
ldr r0, =sub_80C2760 ldr r0, =sub_80C2760
movs r1, 0 movs r1, 0
bl CreateTask bl CreateTask
@@ -3976,7 +3976,7 @@ sub_80C4998: @ 80C4998
bl HideBg bl HideBg
movs r0, 0x3 movs r0, 0x3
bl HideBg bl HideBg
bl remove_some_task bl ScanlineEffect_Stop
bl dp12_8087EA4 bl dp12_8087EA4
movs r1, 0 movs r1, 0
ldr r0, =gUnknown_02038C28 ldr r0, =gUnknown_02038C28
@@ -5310,7 +5310,7 @@ _080C54AC:
_080C54D8: _080C54D8:
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
bl remove_some_task bl ScanlineEffect_Stop
bl SetVBlankHBlankCallbacksToNull bl SetVBlankHBlankCallbacksToNull
movs r0, 0x2 movs r0, 0x2
bl DisableInterrupts bl DisableInterrupts
@@ -5594,7 +5594,7 @@ _080C577C:
bl HideBg bl HideBg
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
bl remove_some_task bl ScanlineEffect_Stop
bl SetVBlankHBlankCallbacksToNull bl SetVBlankHBlankCallbacksToNull
b _080C57E4 b _080C57E4
_080C57A6: _080C57A6:
@@ -7189,7 +7189,7 @@ _080C64F0:
_080C6510: _080C6510:
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
bl remove_some_task bl ScanlineEffect_Stop
bl SetVBlankHBlankCallbacksToNull bl SetVBlankHBlankCallbacksToNull
b _080C6694 b _080C6694
_080C6520: _080C6520:
@@ -7400,7 +7400,7 @@ _080C66FC:
_080C6722: _080C6722:
movs r0, 0 movs r0, 0
bl SetVBlankCallback bl SetVBlankCallback
bl remove_some_task bl ScanlineEffect_Stop
bl SetVBlankHBlankCallbacksToNull bl SetVBlankHBlankCallbacksToNull
b _080C67A4 b _080C67A4
_080C6732: _080C6732:
asm/trainer_rematch.s
Executable → Regular
View File
asm/unk_sprite_file.s
-607
View File
@@ -1,607 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81DA700
sub_81DA700: @ 81DA700
push {lr}
sub sp, 0x8
add r1, sp, 0x4
mov r0, sp
bl sub_8149F58
ldr r0, =gUnknown_0862AD54
ldr r1, [sp, 0x4]
bl LZ77UnCompVram
ldr r0, =gUnknown_0862AF30
ldr r1, [sp]
bl LZ77UnCompVram
ldr r0, =gUnknown_0862B53C
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
ldr r0, =gUnknown_0862B724
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0862B72C
bl LoadSpritePalette
add sp, 0x8
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA700
thumb_func_start sub_81DA74C
sub_81DA74C: @ 81DA74C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
adds r5, r0, 0
adds r6, r1, 0
ldr r0, [sp, 0x24]
ldr r1, [sp, 0x28]
ldr r4, [sp, 0x2C]
lsls r2, 24
lsrs r2, 24
str r2, [sp]
lsls r3, 24
lsrs r3, 24
mov r10, r3
lsls r0, 24
lsrs r0, 24
mov r8, r0
lsls r1, 24
lsrs r1, 24
mov r9, r1
lsls r4, 24
lsrs r7, r4, 24
ldr r0, =gUnknown_0862B758
lsls r5, 16
asrs r5, 16
lsls r6, 16
asrs r6, 16
adds r1, r5, 0
adds r2, r6, 0
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
cmp r7, 0x1
beq _081DA7D0
cmp r7, 0x1
bgt _081DA7A8
cmp r7, 0
beq _081DA7B8
b _081DA7AC
.pool
_081DA7A8:
cmp r7, 0x2
beq _081DA7E4
_081DA7AC:
ldr r6, =gSprites
lsls r3, r5, 4
b _081DA7F8
.pool
_081DA7B8:
ldr r2, =gSprites
lsls r3, r5, 4
adds r0, r3, r5
lsls r0, 2
adds r0, r2
movs r1, 0x78
strh r1, [r0, 0x2E]
movs r1, 0x2D
b _081DA7F4
.pool
_081DA7D0:
ldr r2, =gSprites
lsls r3, r5, 4
adds r0, r3, r5
lsls r0, 2
adds r0, r2
movs r1, 0x59
b _081DA7F0
.pool
_081DA7E4:
ldr r2, =gSprites
lsls r3, r5, 4
adds r0, r3, r5
lsls r0, 2
adds r0, r2
movs r1, 0x97
_081DA7F0:
strh r1, [r0, 0x2E]
movs r1, 0x61
_081DA7F4:
strh r1, [r0, 0x30]
adds r6, r2, 0
_081DA7F8:
adds r4, r3, r5
lsls r4, 2
adds r0, r4, r6
mov r2, r8
lsls r1, r2, 24
asrs r1, 24
movs r2, 0
strh r1, [r0, 0x32]
mov r3, r9
lsls r1, r3, 24
asrs r1, 24
strh r1, [r0, 0x34]
mov r1, sp
ldrh r1, [r1]
strh r1, [r0, 0x3A]
mov r3, r10
strh r3, [r0, 0x3C]
strh r2, [r0, 0x36]
strh r2, [r0, 0x38]
adds r1, r7, 0
bl StartSpriteAnim
adds r0, r6, 0
adds r0, 0x1C
adds r4, r0
ldr r0, =sub_81DA848
str r0, [r4]
adds r0, r5, 0
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_81DA74C
thumb_func_start sub_81DA848
sub_81DA848: @ 81DA848
push {r4,r5,lr}
adds r3, r0, 0
adds r2, r3, 0
adds r2, 0x2E
movs r0, 0x20
ldrsh r1, [r3, r0]
movs r4, 0x2E
ldrsh r0, [r3, r4]
cmp r1, r0
bne _081DA874
movs r5, 0x22
ldrsh r1, [r3, r5]
movs r4, 0x2
ldrsh r0, [r2, r4]
cmp r1, r0
bne _081DA874
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
b _081DA8B4
.pool
_081DA874:
ldrh r4, [r2, 0x8]
movs r5, 0x8
ldrsh r1, [r2, r5]
movs r5, 0xC
ldrsh r0, [r2, r5]
cmp r1, r0
bne _081DA890
ldrh r0, [r2, 0x4]
ldrh r1, [r3, 0x20]
adds r0, r1
movs r1, 0
strh r0, [r3, 0x20]
strh r1, [r2, 0x8]
b _081DA894
_081DA890:
adds r0, r4, 0x1
strh r0, [r2, 0x8]
_081DA894:
ldrh r4, [r2, 0xA]
movs r5, 0xA
ldrsh r1, [r2, r5]
movs r5, 0xE
ldrsh r0, [r2, r5]
cmp r1, r0
bne _081DA8B0
ldrh r0, [r2, 0x6]
ldrh r1, [r3, 0x22]
adds r0, r1
movs r1, 0
strh r0, [r3, 0x22]
strh r1, [r2, 0xA]
b _081DA8B4
_081DA8B0:
adds r0, r4, 0x1
strh r0, [r2, 0xA]
_081DA8B4:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_81DA848
thumb_func_start sub_81DA8BC
sub_81DA8BC: @ 81DA8BC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0xC
adds r6, r0, 0
mov r8, r1
ldr r0, [sp, 0x2C]
ldr r1, [sp, 0x30]
ldr r4, [sp, 0x34]
ldr r5, [sp, 0x38]
lsls r2, 16
lsrs r2, 16
str r2, [sp]
lsls r3, 16
lsrs r3, 16
str r3, [sp, 0x4]
lsls r0, 16
lsrs r0, 16
mov r10, r0
lsls r1, 16
lsrs r1, 16
mov r9, r1
lsls r4, 16
lsrs r7, r4, 16
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_0862B758
lsls r6, 16
asrs r6, 16
mov r1, r8
lsls r1, 16
asrs r1, 16
mov r8, r1
adds r1, r6, 0
mov r2, r8
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
cmp r5, 0x1
beq _081DA94C
cmp r5, 0x1
bgt _081DA924
cmp r5, 0
beq _081DA934
b _081DA928
.pool
_081DA924:
cmp r5, 0x2
beq _081DA960
_081DA928:
ldr r2, =gSprites
lsls r3, r6, 4
b _081DA972
.pool
_081DA934:
ldr r2, =gSprites
lsls r3, r6, 4
adds r0, r3, r6
lsls r0, 2
adds r0, r2
movs r1, 0x78
strh r1, [r0, 0x2E]
movs r1, 0x2D
b _081DA970
.pool
_081DA94C:
ldr r2, =gSprites
lsls r3, r6, 4
adds r0, r3, r6
lsls r0, 2
adds r0, r2
movs r1, 0x59
b _081DA96C
.pool
_081DA960:
ldr r2, =gSprites
lsls r3, r6, 4
adds r0, r3, r6
lsls r0, 2
adds r0, r2
movs r1, 0x97
_081DA96C:
strh r1, [r0, 0x2E]
movs r1, 0x61
_081DA970:
strh r1, [r0, 0x30]
_081DA972:
adds r4, r3, r6
lsls r4, 2
adds r0, r4, r2
mov r3, sp
ldrh r3, [r3]
strh r3, [r0, 0x32]
mov r1, sp
ldrh r1, [r1, 0x4]
strh r1, [r0, 0x34]
mov r3, r10
strh r3, [r0, 0x36]
mov r1, r9
strh r1, [r0, 0x38]
strh r7, [r0, 0x3A]
adds r1, r5, 0
str r2, [sp, 0x8]
bl StartSpriteAnim
ldr r2, [sp, 0x8]
adds r0, r2, 0
adds r0, 0x1C
adds r4, r0
ldr r0, =sub_81DA9BC
str r0, [r4]
adds r0, r6, 0
add sp, 0xC
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_81DA8BC
thumb_func_start sub_81DA9BC
sub_81DA9BC: @ 81DA9BC
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
bl Sin2
lsls r0, 16
asrs r0, 16
movs r2, 0x36
ldrsh r1, [r4, r2]
muls r0, r1
asrs r0, 12
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x32]
bl Cos2
lsls r0, 16
asrs r0, 16
movs r3, 0x36
ldrsh r1, [r4, r3]
muls r0, r1
asrs r0, 12
strh r0, [r4, 0x26]
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r2, 0x34
ldrsh r1, [r4, r2]
adds r0, r1
movs r1, 0xB4
lsls r1, 1
bl __modsi3
strh r0, [r4, 0x32]
ldrh r2, [r4, 0x36]
movs r3, 0x36
ldrsh r1, [r4, r3]
movs r3, 0x38
ldrsh r0, [r4, r3]
cmp r1, r0
beq _081DAA12
ldrh r0, [r4, 0x3A]
adds r0, r2, r0
strh r0, [r4, 0x36]
b _081DAA16
_081DAA12:
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_081DAA16:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA9BC
thumb_func_start sub_81DAA20
sub_81DAA20: @ 81DAA20
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =0x00002e90
adds r0, r4, 0
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
movs r0, 0x10
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gSprites
adds r0, r4
bl DestroySprite
movs r0, 0x12
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
bl DestroySprite
movs r0, 0x14
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
bl DestroySprite
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DAA20
thumb_func_start sub_81DAA74
sub_81DAA74: @ 81DAA74
push {r4,r5,lr}
adds r3, r0, 0
ldr r2, =gSprites
movs r0, 0x10
ldrsh r1, [r3, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r5, r2, 0
adds r5, 0x1C
adds r0, r5
ldr r4, [r0]
ldr r0, =SpriteCallbackDummy
cmp r4, r0
bne _081DAAC4
movs r0, 0x12
ldrsh r1, [r3, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r2, [r0]
cmp r2, r4
bne _081DAAC4
movs r1, 0x14
ldrsh r0, [r3, r1]
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r1, r5
ldr r0, [r1]
cmp r0, r2
bne _081DAAC4
movs r0, 0x1
b _081DAAC6
.pool
_081DAAC4:
movs r0, 0
_081DAAC6:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_81DAA74
thumb_func_start sub_81DAACC
sub_81DAACC: @ 81DAACC
push {r4,lr}
adds r4, r0, 0
movs r1, 0xA
ldrsh r0, [r4, r1]
cmp r0, 0
beq _081DAB20
bl sub_81DA700
ldr r1, =0x00003f41
movs r0, 0x50
bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
bl SetGpuReg
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgY
movs r1, 0xA0
lsls r1, 3
movs r0, 0
movs r2, 0x2
bl ChangeBgY
movs r0, 0
strh r0, [r4, 0xA]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
movs r0, 0x1
b _081DAB46
.pool
_081DAB20:
movs r1, 0x80
lsls r1, 6
movs r0, 0
bl ClearGpuRegBits
movs r1, 0x80
lsls r1, 7
movs r0, 0
bl ClearGpuRegBits
movs r1, 0x80
lsls r1, 1
movs r0, 0
bl ClearGpuRegBits
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
_081DAB46:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DAACC
thumb_func_start sub_81DAB4C
sub_81DAB4C: @ 81DAB4C
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
movs r1, 0xC
ldrsh r0, [r4, r1]
cmp r0, 0
bne _081DAB64
movs r1, 0x80
lsls r1, 1
movs r0, 0
bl SetGpuRegBits
_081DAB64:
ldrh r1, [r4, 0xC]
movs r2, 0xC
ldrsh r0, [r4, r2]
cmp r0, 0x10
bne _081DAB98
ldrh r1, [r4, 0xE]
movs r2, 0xE
ldrsh r0, [r4, r2]
cmp r0, 0x1F
bne _081DAB92
movs r1, 0x1
negs r1, r1
movs r0, 0
str r0, [sp]
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
b _081DABB0
_081DAB92:
adds r0, r1, 0x1
strh r0, [r4, 0xE]
b _081DABB0
_081DAB98:
adds r0, r1, 0x1
strh r0, [r4, 0xC]
ldrh r1, [r4, 0xC]
movs r0, 0x10
subs r0, r1
lsls r0, 8
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
_081DABB0:
movs r0, 0
add sp, 0x4
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DAB4C
.align 2, 0 @ Don't pad with nop.
asm/unk_transition.s
-725
View File
@@ -1,725 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81DABBC
sub_81DABBC: @ 81DABBC
push {r4,lr}
adds r4, r0, 0
bl sub_81DAA74
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _081DABD2
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DABD2:
movs r0, 0
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DABBC
thumb_func_start sub_81DABDC
sub_81DABDC: @ 81DABDC
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B770
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DABEE:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DABEE
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DABDC
thumb_func_start sub_81DAC14
sub_81DAC14: @ 81DAC14
push {r4-r6,lr}
sub sp, 0xC
adds r6, r0, 0
movs r1, 0x33
negs r1, r1
movs r0, 0
str r0, [sp]
movs r5, 0x2
str r5, [sp, 0x4]
str r0, [sp, 0x8]
movs r0, 0x78
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x10]
movs r0, 0x7
negs r0, r0
str r5, [sp]
movs r4, 0x2
negs r4, r4
str r4, [sp, 0x4]
movs r1, 0x1
str r1, [sp, 0x8]
movs r1, 0xC1
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x12]
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
movs r0, 0xF7
movs r1, 0xC1
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x14]
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
movs r0, 0
add sp, 0xC
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81DAC14
thumb_func_start sub_81DAC80
sub_81DAC80: @ 81DAC80
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DACA4
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DABDC
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DACA4:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DAC80
thumb_func_start sub_81DACB4
sub_81DACB4: @ 81DACB4
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B784
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DACC6:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DACC6
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DACB4
thumb_func_start sub_81DACEC
sub_81DACEC: @ 81DACEC
push {r4,r5,lr}
sub sp, 0xC
adds r5, r0, 0
movs r0, 0
str r0, [sp]
movs r4, 0x4
negs r4, r4
str r4, [sp, 0x4]
str r0, [sp, 0x8]
movs r0, 0x78
movs r1, 0xC5
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
str r4, [sp]
movs r4, 0x2
str r4, [sp, 0x4]
movs r0, 0x1
str r0, [sp, 0x8]
movs r0, 0xF1
movs r1, 0x3B
movs r2, 0
movs r3, 0x1
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
movs r0, 0x1
negs r0, r0
movs r1, 0x4
str r1, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
movs r1, 0x3B
movs r2, 0
movs r3, 0x1
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
movs r0, 0
add sp, 0xC
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_81DACEC
thumb_func_start sub_81DAD58
sub_81DAD58: @ 81DAD58
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DAD7C
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DACB4
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DAD7C:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DAD58
thumb_func_start sub_81DAD8C
sub_81DAD8C: @ 81DAD8C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B798
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DAD9E:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DAD9E
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DAD8C
thumb_func_start sub_81DADC4
sub_81DADC4: @ 81DADC4
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0x10
mov r8, r0
movs r6, 0x80
str r6, [sp]
movs r4, 0
str r4, [sp, 0x4]
movs r5, 0x4
negs r5, r5
str r5, [sp, 0x8]
str r4, [sp, 0xC]
movs r0, 0x78
movs r1, 0x2D
movs r2, 0xC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x10]
str r6, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x59
movs r1, 0x61
movs r2, 0xFC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x12]
str r6, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x97
movs r1, 0x61
movs r2, 0x84
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x14]
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
movs r0, 0
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81DADC4
thumb_func_start sub_81DAE44
sub_81DAE44: @ 81DAE44
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DAE68
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DAD8C
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DAE68:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DAE44
thumb_func_start sub_81DAE78
sub_81DAE78: @ 81DAE78
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7AC
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DAE8A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DAE8A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DAE78
thumb_func_start sub_81DAEB0
sub_81DAEB0: @ 81DAEB0
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0x10
mov r8, r0
movs r2, 0x8E
lsls r2, 1
movs r6, 0x83
str r6, [sp]
movs r5, 0x23
str r5, [sp, 0x4]
movs r4, 0x3
negs r4, r4
str r4, [sp, 0x8]
movs r0, 0
str r0, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x10]
str r6, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r2, 0x2C
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x12]
str r6, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x79
movs r1, 0x50
movs r2, 0xA4
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x14]
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
movs r0, 0
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81DAEB0
thumb_func_start sub_81DAF34
sub_81DAF34: @ 81DAF34
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DAF58
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DAE78
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DAF58:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DAF34
thumb_func_start sub_81DAF68
sub_81DAF68: @ 81DAF68
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7C0
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DAF7A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DAF7A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DAF68
thumb_func_start sub_81DAFA0
sub_81DAFA0: @ 81DAFA0
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
movs r0, 0xA
ldrsh r2, [r4, r0]
cmp r2, 0
bne _081DAFCC
movs r1, 0x33
negs r1, r1
str r2, [sp]
movs r0, 0x4
str r0, [sp, 0x4]
str r2, [sp, 0x8]
movs r0, 0x78
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB01A
_081DAFCC:
cmp r2, 0x10
bne _081DAFF2
movs r0, 0x7
negs r0, r0
movs r1, 0x4
str r1, [sp]
subs r1, 0x8
str r1, [sp, 0x4]
movs r1, 0x1
str r1, [sp, 0x8]
movs r1, 0xC1
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB01A
_081DAFF2:
cmp r2, 0x20
bne _081DB01A
movs r0, 0x4
negs r0, r0
str r0, [sp]
str r0, [sp, 0x4]
movs r0, 0x2
str r0, [sp, 0x8]
movs r0, 0xF7
movs r1, 0xC1
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB01A:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0xC
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DAFA0
thumb_func_start sub_81DB02C
sub_81DB02C: @ 81DB02C
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB050
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DAF68
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB050:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB02C
thumb_func_start sub_81DB060
sub_81DB060: @ 81DB060
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7D4
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DB072:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DB072
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DB060
thumb_func_start sub_81DB098
sub_81DB098: @ 81DB098
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
movs r0, 0xA
ldrsh r1, [r4, r0]
cmp r1, 0
bne _081DB0C4
str r1, [sp]
movs r0, 0x8
negs r0, r0
str r0, [sp, 0x4]
str r1, [sp, 0x8]
movs r0, 0x78
movs r1, 0xC5
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB112
_081DB0C4:
cmp r1, 0x10
bne _081DB0E8
movs r0, 0x8
negs r0, r0
str r0, [sp]
movs r0, 0x1
str r0, [sp, 0x4]
str r0, [sp, 0x8]
movs r0, 0xF1
movs r1, 0x4E
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB112
_081DB0E8:
cmp r1, 0x20
bne _081DB112
movs r0, 0x1
negs r0, r0
movs r1, 0x8
str r1, [sp]
movs r1, 0x1
str r1, [sp, 0x4]
movs r1, 0x2
str r1, [sp, 0x8]
movs r1, 0x4E
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB112:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0xC
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DB098
thumb_func_start sub_81DB124
sub_81DB124: @ 81DB124
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB148
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DB060
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB148:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB124
.align 2, 0 @ Don't pad with nop.
asm/unk_transition_2.s
-268
View File
@@ -1,268 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81DB158
sub_81DB158: @ 81DB158
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7E8
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DB16A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DB16A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DB158
thumb_func_start sub_81DB190
sub_81DB190: @ 81DB190
push {r4,lr}
sub sp, 0x10
adds r4, r0, 0
movs r0, 0xA
ldrsh r1, [r4, r0]
cmp r1, 0
bne _081DB1BE
movs r0, 0x80
str r0, [sp]
str r1, [sp, 0x4]
subs r0, 0x84
str r0, [sp, 0x8]
str r1, [sp, 0xC]
movs r0, 0x78
movs r1, 0x2D
movs r2, 0xC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB212
_081DB1BE:
cmp r1, 0x10
bne _081DB1E6
movs r0, 0x80
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
subs r0, 0x4
str r0, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x59
movs r1, 0x61
movs r2, 0xFC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB212
_081DB1E6:
cmp r1, 0x20
bne _081DB212
movs r0, 0x80
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
subs r0, 0x4
str r0, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x97
movs r1, 0x61
movs r2, 0x84
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB212:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0x10
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DB190
thumb_func_start sub_81DB224
sub_81DB224: @ 81DB224
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB248
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DB158
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB248:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB224
thumb_func_start sub_81DB258
sub_81DB258: @ 81DB258
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7FC
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DB26A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DB26A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DB258
thumb_func_start sub_81DB290
sub_81DB290: @ 81DB290
push {r4,lr}
sub sp, 0x10
adds r4, r0, 0
movs r0, 0xA
ldrsh r1, [r4, r0]
cmp r1, 0
bne _081DB2C2
movs r2, 0x8E
lsls r2, 1
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
str r1, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB316
_081DB2C2:
cmp r1, 0x10
bne _081DB2EA
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r2, 0x2C
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB316
_081DB2EA:
cmp r1, 0x20
bne _081DB316
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x79
movs r1, 0x50
movs r2, 0xA4
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB316:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0x10
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DB290
thumb_func_start sub_81DB328
sub_81DB328: @ 81DB328
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB34C
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =sub_81DB258
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB34C:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB328
.align 2, 0 @ Don't pad with nop.
asm/unknown_task.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start remove_some_task thumb_func_start ScanlineEffect_Stop
remove_some_task: @ 80B9FB8 ScanlineEffect_Stop: @ 80B9FB8
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_02039B28 ldr r4, =gUnknown_02039B28
movs r0, 0 movs r0, 0
@@ -32,7 +32,7 @@ _080B9FE2:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end remove_some_task thumb_func_end ScanlineEffect_Stop
thumb_func_start dp12_8087EA4 thumb_func_start dp12_8087EA4
dp12_8087EA4: @ 80B9FF8 dp12_8087EA4: @ 80B9FF8
asm/use_pokeblock.s
Executable → Regular
View File
build_tools.sh
Regular → Executable
+7 -7
View File
@@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
make -C tools/gbagfx make -C tools/gbagfx CXX=${1:-g++}
make -C tools/scaninc make -C tools/scaninc CXX=${1:-g++}
make -C tools/preproc make -C tools/preproc CXX=${1:-g++}
make -C tools/bin2c make -C tools/bin2c CXX=${1:-g++}
make -C tools/rsfont make -C tools/rsfont CXX=${1:-g++}
make -C tools/aif2pcm make -C tools/aif2pcm CXX=${1:-g++}
make -C tools/ramscrgen make -C tools/ramscrgen CXX=${1:-g++}
data/battle_anim_815A0D4.s
+1 -2
View File
@@ -505,6 +505,5 @@ gUnknown_085CE9B0:: @ 85CE9B0
.align 2 .align 2
gUnknown_085CE9C8:: @ 85CE9C8 gUnknown_085CE9C8:: @ 85CE9C8
.2byte 0x0000, 0x0010, 0x0400, 0x0000, 0xfffe, 0x0000, 0x0800, 0x0000, 0x0000, 0x0004, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000 .2byte 0x0000, 0x0010, 0x0400, 0x0000, 0xfffe, 0x0000, 0x0800, 0x0000, 0x0000, 0x0004, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000
.2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000, 0x03e0, 0x001f, 0x001c, 0x001a, 0x0018, 0x0000, 0x0000, 0x0000 .2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.2byte 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6318, 0x0000, 0x7fff
data/battle_frontier_1.s
+1 -1
View File
@@ -243,7 +243,7 @@ gUnknown_0860CE94:: @ 860CE94
window_template 0x00, 0x00, 0x03, 0x08, 0x10, 0x0f, 0x0010 window_template 0x00, 0x00, 0x03, 0x08, 0x10, 0x0f, 0x0010
window_template 0x00, 0x16, 0x03, 0x08, 0x10, 0x0f, 0x0090 window_template 0x00, 0x16, 0x03, 0x08, 0x10, 0x0f, 0x0090
window_template 0x00, 0x08, 0x01, 0x0e, 0x02, 0x0f, 0x0110 window_template 0x00, 0x08, 0x01, 0x0e, 0x02, 0x0f, 0x0110
window_template_terminator null_window_template
.align 2 .align 2
gUnknown_0860CEB4:: @ 860CEB4 gUnknown_0860CEB4:: @ 860CEB4
data/battle_frontier_2.s
+162 -3
View File
@@ -108,7 +108,7 @@ gUnknown_08610434:: @ 8610434
window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b
window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b
window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb
window_template_terminator null_window_template
.align 1 .align 1
gUnknown_0861046C:: @ 861046C gUnknown_0861046C:: @ 861046C
@@ -345,7 +345,7 @@ gUnknown_086108C8:: @ 86108C8
window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1 window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1
window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9 window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9
window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df
window_template_terminator null_window_template
gUnknown_08610918:: @ 8610918 gUnknown_08610918:: @ 8610918
.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00
@@ -373,7 +373,166 @@ gUnknown_08610948:: @ 8610948
.align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data .align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data
gUnknown_08610970:: @ 8610970 gUnknown_08610970:: @ 8610970
.incbin "baserom.gba", 0x610970, 0x580 .string "サダヒロ$", 8
.string "ALANN$", 8
.string "ALAIN$", 8
.string "ADELFO$", 8
.string "CLAUS$", 8
.string "TEO$", 8
.byte 0xC9, 0xBD
.2byte 0x43
.2byte SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT, 0
.byte 0x1D, 8, 0x3e, 20, 0, 12, 1, 10, 0x30, 6, 0x44, 20, 0, 0
.string "ヒロオ$", 8
.string "LIONEL$", 8
.string "LIONEL$", 8
.string "CAIO$", 8
.string "LUDWIG$", 8
.string "LEO$", 8
.byte 0x9, 0xCF
.2byte 0x2B
.2byte SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH, 1
.byte 0x38, 12, 1, 10, 0x30, 6, 6, 10, 0x20, 0x10, 0x13, 0x22, 0, 0
.string "ケイジ$", 8
.string "SONNY$", 8
.string "HERVE$", 8
.string "FEDRO$", 8
.string "WENZEL$", 8
.string "SANTI$", 8
.byte 0x34, 0x2E
.2byte 0x26
.2byte SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP, 2
.byte 1, 10, 10, 0x16, 0x15, 14, 0x30, 6, 0x3b, 12, 0x4, 12, 0, 0
.string "ユラ$", 8
.string "LAYLA$", 8
.string "LAYLA$", 8
.string "ASTRID$", 8
.string "SONJA$", 8
.string "LOLA$", 8
.byte 0xEF, 0x84
.2byte 0x47
.2byte SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA, 3
.byte 11, 16, 15, 0x1e, 0x39, 16, 0x21, 0x14, 0x3, 12, 0xff, 0xff, 0, 0
.string "ヨウカ$", 8
.string "MACY$", 8
.string "AMELIE$", 8
.string "CLEO$", 8
.string "MARIA$", 8
.string "ELISA$", 8
.byte 0x43, 0x1E
.2byte 0x27
.2byte SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY, 4
.byte 15, 0x1e, 0x14, 16, 6, 16, 15, 0x28, 0x1c, 0x1c, 0x13, 0x1c, 0, 0
.string "ヤスシ$", 8
.string "DONTE$", 8
.string "BRAHIM$", 8
.string "GLAUCO$", 8
.string "JOSEF$", 8
.string "ROQUE$", 8
.byte 0x9F, 0x37
.2byte 0x30
.2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA, 5
.byte 0x29, 0x0A, 0x08, 0x14, 0x2F, 0x10, 0x38, 0x16, 0x20, 0x08, 0x00, 0x0C, 0x00, 0
.string "ミサオ$", 8
.string "AMIRA$", 8
.string "LAURE$", 8
.string "DAFNE$", 8
.string "AMELIE$", 8
.string "LARA$", 8
.byte 0x55, 0xF5
.2byte 0x31
.2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO, 6
.byte 0x0B, 0x0C, 0x3E, 0x12, 0x00, 0x0C, 0x31, 0x0A, 0x30, 0x14, 0x00, 0x0C, 0x00, 0x00
.string "カズサ$", 8
.string "KALI$", 8
.string "JODIE$", 8
.string "ILENIA$", 8
.string "KARO$", 8
.string "ELSA$", 8
.byte 0x26, 0x8D
.2byte 0x14
.2byte SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC, 7
.byte 0x06, 0x0A, 0x20, 0x06, 0x1F, 0x0A, 0x02, 0x0A, 0x03, 0x0C, 0xFF, 0xFF, 0x00, 0x00
.string "スミレ$", 8
.string "ANNIE$", 8
.string "ANNIE$", 8
.string "IMELDA$", 8
.string "INES$", 8
.string "ROSA$", 8
.byte 0xC, 0x80
.2byte 0xD
.2byte SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY, 8
.byte 0x22, 0x1E, 0x33, 0x04, 0x0E, 0x02, 0x02, 0x0A, 0x1E, 0x10, 0x00, 0x0C, 0x00, 0x00
.string "アキノリ$", 8
.string "DILLEN$", 8
.string "RENE$", 8
.string "INDRO$", 8
.string "DETLEF$", 8
.string "PEDRO$", 8
.byte 0x9f, 0x46
.2byte 0
.2byte SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON, 9
.byte 0x3D, 0x0A, 0x11, 0x10, 0x1E, 0x0E, 0x1C, 0x20, 0x04, 0x0C, 0xFF, 0xFF, 0x00, 0x00
.string "トウゾウ$", 8
.string "DALLAS$", 8
.string "BRUNO$", 8
.string "LEARCO$", 8
.string "ANSGAR$", 8
.string "MANOLO$", 8
.byte 0xFC, 0x71
.2byte 0x2D
.2byte SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA, 10
.byte 0x05, 0x0A, 0x06, 0x06, 0x0E, 0x16, 0x14, 0x0A, 0x00, 0x0C, 0xFF, 0xFF, 0x00, 0x00
.string "セイヤ$", 8
.string "FRANK$", 8
.string "FRANK$", 8
.string "OLINDO$", 8
.string "FRANK$", 8
.string "MAURO$", 8
.byte 0x9E, 0xA3
.2byte 0x3A
.2byte SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE, 11
.byte 0x0E, 0x28, 0x3D, 0x10, 0x0F, 0x24, 0x14, 0x0A, 0x23, 0x1E, 0x24, 0x10, 0x00, 0x00
.string "リュウジ$", 8
.string "LAMONT$", 8
.string "XAV$", 8
.string "ORFEO$", 8
.string "J{0xf3}RGEN$", 8 @accent?
.string "JORGE$", 8
.byte 0x90, 0xE5
.2byte 0x19
.2byte SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING, 12
.byte 0x20, 0x10, 0x2E, 0x06, 0x0B, 0x10, 0x22, 0x1E, 0x0F, 0x1E, 0x0B, 0x10, 0x00, 0x00
.string "カツアキ$", 8
.string "TYRESE$", 8
.string "ANDY$", 8
.string "PARIDE$", 8
.string "DAVID$", 8
.string "CHICHO$", 8
.byte 0x18, 0xD0
.2byte 10
.2byte SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING, 13
.byte 0x29, 0x0A, 0x3A, 0x06, 0x15, 0x0E, 0x35, 0x14, 0x34, 0x10, 0x1E, 0x06, 0x00, 0x00
.string "トシミツ$", 8
.string "DANTE$", 8
.string "DANTE$", 8
.string "RAOUL$", 8
.string "LOTHAR$", 8
.string "PABLO$", 8
.byte 0x75, 0xBC
.2byte 14
.2byte SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM, 14
.byte 0x01, 0x0A, 0x17, 0x10, 0x43, 0x12, 0x22, 0x1E, 0x0B, 0x10, 0x0F, 0x28, 0x00, 0x00
.string "ローウェン$", 8
.string "ARTURO$", 8
.string "ARTURO$", 8
.string "ROMOLO$", 8
.string "BRIAN$", 8
.string "ARTURO$", 8
.byte 0x2, 0xFA
.2byte 0x20
.2byte SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS, 15
.byte 0x0F, 0x1E, 0x04, 0x14, 0x2F, 0x10, 0x06, 0x10, 0x20, 0x10, 0x03, 0x0E, 0x00, 0x00
.align 2 .align 2
gUnknown_08610EF0:: @ 8610EF0 gUnknown_08610EF0:: @ 8610EF0
data/battle_records.s
+1 -1
View File
@@ -23,7 +23,7 @@ gUnknown_085B3D64:: @ 85B3D64
.align 2 .align 2
gUnknown_085B3D6C:: @ 85B3D6C gUnknown_085B3D6C:: @ 85B3D6C
window_template 0x00, 0x02, 0x01, 0x1a, 0x12, 0x0f, 0x0014 window_template 0x00, 0x02, 0x01, 0x1a, 0x12, 0x0f, 0x0014
window_template_terminator null_window_template
.align 2 .align 2
gUnknown_085B3D7C:: @ 85B3D7C gUnknown_085B3D7C:: @ 85B3D7C
data/battle_transition.s
-784
View File
@@ -1,784 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
sBigPokeball_Tileset:: @ 85B9330
.incbin "graphics/battle_transitions/big_pokeball.4bpp"
.align 2
sPokeballTrail_Tileset:: @ 85B98B0
.incbin "graphics/battle_transitions/pokeball_trail.4bpp"
.align 2
sSpriteImage_85B98F0:: @ 85B98F0
.incbin "graphics/battle_transitions/pokeball.4bpp"
.align 2
sUnknown_085B9AF0:: @ 85B9AF0
.incbin "graphics/battle_transitions/elite_four_bg.4bpp"
.align 2
sSpriteImage_85B9CD0:: @ 85B9CD0
.incbin "graphics/battle_transitions/unused_brendan.4bpp"
.align 2
sSpriteImage_85BA4D0:: @ 85BA4D0
.incbin "graphics/battle_transitions/unused_lass.4bpp"
.align 2
sShrinkingBoxTileset:: @ 85BACD0
.incbin "graphics/battle_transitions/shrinking_box.4bpp"
.align 2
sEvilTeam_Palette:: @ 85BAEB0
.incbin "graphics/battle_transitions/evil_team.gbapal"
.align 2
sTeamAqua_Tileset:: @ 85BAED0
.incbin "graphics/battle_transitions/team_aqua.4bpp.lz"
.align 2
sTeamAqua_Tilemap:: @ 85BB248
.incbin "graphics/battle_transitions/team_aqua.bin.lz"
.align 2
sTeamMagma_Tileset:: @ 85BB4A4
.incbin "graphics/battle_transitions/team_magma.4bpp.lz"
.align 2
sTeamMagma_Tilemap:: @ 85BB930
.incbin "graphics/battle_transitions/team_magma.bin.lz"
.align 2
gUnknown_085BBC14:: @ 85BBC14
.incbin "graphics/battle_transitions/85BBC14.4bpp"
.align 2
gUnknown_085BC2B4:: @ 85BC2B4
.incbin "graphics/battle_transitions/85BC2B4.gbapal"
.align 2
gUnknown_085BC2D4:: @ 85BC2D4
.incbin "graphics/battle_transitions/85BC2D4.gbapal"
.align 2
gUnknown_085BC2F4:: @ 85BC2F4
.incbin "graphics/battle_transitions/85BC2F4.gbapal"
.align 2
gUnknown_085BC314:: @ 85BC314
.incbin "graphics/battle_transitions/85BC314.bin"
.align 2
gUnknown_085BCB14:: @ 85BCB14
.incbin "graphics/battle_transitions/85BCB14.bin"
.align 2
gUnknown_085BD314:: @ 85BD314
.incbin "graphics/battle_transitions/85BD314.bin"
.align 2
gUnknown_085BDB14:: @ 85BDB14
.incbin "graphics/battle_transitions/85BDB14.gbapal"
.align 2
gUnknown_085BDB34:: @ 85BDB34
.incbin "graphics/battle_transitions/kyogre.4bpp.lz"
.align 2
gUnknown_085BE1E8:: @ 85BE1E8
.incbin "graphics/battle_transitions/kyogre.bin.lz"
.align 2
gUnknown_085BE51C:: @ 85BE51C
.incbin "graphics/battle_transitions/groudon.4bpp.lz"
.align 2
gUnknown_085BEA88:: @ 85BEA88
.incbin "graphics/battle_transitions/groudon.bin.lz"
.align 2
gUnknown_085BEDA0:: @ 85BEDA0
.incbin "graphics/battle_transitions/kyogre_pt1.gbapal"
.align 2
gUnknown_085BEEE0:: @ 85BEEE0
.incbin "graphics/battle_transitions/kyogre_pt2.gbapal"
.align 2
gUnknown_085BF0A0:: @ 85BF0A0
.incbin "graphics/battle_transitions/groudon_pt1.gbapal"
.align 2
gUnknown_085BF2A0:: @ 85BF2A0
.incbin "graphics/battle_transitions/groudon_pt2.gbapal"
.align 2
gUnknown_085BF4A0:: @ 85BF4A0
.incbin "graphics/battle_transitions/rayquaza.gbapal"
.align 2
gUnknown_085BF6A0:: @ 85BF6A0
.incbin "graphics/battle_transitions/rayquaza.4bpp"
.align 2
gUnknown_085C6BE0:: @ 85C6BE0
.incbin "graphics/battle_transitions/rayquaza.bin"
.align 2
gUnknown_085C7BE0:: @ 85C7BE0
.incbin "graphics/battle_transitions/frontier_brain.gbapal"
.align 2
gUnknown_085C7C00:: @ 85C7C00
.incbin "graphics/battle_transitions/frontier_brain.4bpp.lz"
.align 2
gUnknown_085C828C:: @ 85C828C
.incbin "graphics/battle_transitions/frontier_brain.bin.lz"
.align 2
gUnknown_085C8578:: @ 85C8578
.incbin "graphics/battle_transitions/frontier_squares_blanktiles.gbapal"
.align 2
gUnknown_085C8598:: @ 85C8598
.incbin "graphics/battle_transitions/frontier_square_1.4bpp.lz"
.align 2
gUnknown_085C86F4:: @ 85C86F4
.incbin "graphics/battle_transitions/frontier_square_2.4bpp.lz"
.align 2
gUnknown_085C87F4:: @ 85C87F4
.incbin "graphics/battle_transitions/frontier_square_3.4bpp.lz"
.align 2
gUnknown_085C88A4:: @ 85C88A4
.incbin "graphics/battle_transitions/frontier_square_4.4bpp.lz"
.align 2
gUnknown_085C8928:: @ 85C8928
.incbin "graphics/battle_transitions/frontier_squares.bin"
.align 2
sPhase1_Tasks:: @ 85C8948
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.4byte sub_81460BC
.align 2
sPhase2_Tasks:: @ 85C89F0
.4byte sub_814610C
.4byte sub_8146204
.4byte sub_8146384
.4byte sub_8146514
.4byte sub_8146F94
.4byte sub_8147204
.4byte sub_8147718
.4byte sub_81478EC
.4byte sub_81484D0
.4byte sub_8149578
.4byte sub_814995C
.4byte sub_8149A6C
.4byte sub_8147AE4
.4byte sub_8147B04
.4byte sub_8147B24
.4byte sub_8147B44
.4byte sub_8147B64
.4byte sub_814654C
.4byte sub_8146584
.4byte sub_81465BC
.4byte sub_81465F4
.4byte sub_814662C
.4byte sub_8146664
.4byte sub_8149140
.4byte sub_814927C
.4byte sub_8148760
.4byte sub_8148B54
.4byte sub_8148B8C
.4byte sub_8148E54
.4byte sub_814A3BC
.4byte sub_814A3F4
.4byte sub_814A6F0
.4byte sub_814A760
.4byte sub_814A728
.4byte sub_81DABDC
.4byte sub_81DACB4
.4byte sub_81DAD8C
.4byte sub_81DAE78
.4byte sub_81DAF68
.4byte sub_81DB060
.4byte sub_81DB158
.4byte sub_81DB258
.align 2
sMainTransitionPhases:: @ 85C8A98
.4byte sub_8145FE0
.4byte sub_8146030
.4byte sub_8146064
.4byte sub_814608C
.align 2
sPhase2_Transition_Blur_Funcs:: @ 85C8AA8
.4byte sub_8146144
.4byte sub_8146178
.4byte sub_81461D8
.align 2
sPhase2_Transition_Swirl_Funcs:: @ 85C8AB4
.4byte sub_814623C
.4byte sub_81462A8
.align 2
sPhase2_Transition_Shuffle_Funcs:: @ 85C8ABC
.4byte sub_81463BC
.4byte sub_8146420
.align 2
gUnknown_085C8AC4:: @ 85C8AC4
.4byte sub_814670C
.4byte sub_81468E4
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146D90
.4byte sub_8146DF8
.align 2
gUnknown_085C8AE0:: @ 85C8AE0
.4byte sub_8146760
.4byte sub_814692C
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146D90
.4byte sub_8146DF8
.align 2
gUnknown_085C8AFC:: @ 85C8AFC
.4byte sub_8146800
.4byte sub_8146854
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146DF8
.align 2
gUnknown_085C8B14:: @ 85C8B14
.4byte sub_81467B4
.4byte sub_8146974
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146DF8
.align 2
gUnknown_085C8B2C:: @ 85C8B2C
.4byte sub_81467B4
.4byte sub_81469CC
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146DF8
.align 2
gUnknown_085C8B44:: @ 85C8B44
.4byte sub_81467B4
.4byte sub_8146A24
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146DF8
.align 2
gUnknown_085C8B5C:: @ 85C8B5C
.4byte sub_8146DAC
.4byte sub_8146DD8
.4byte sub_8146A7C
.4byte sub_8146AC8
.4byte sub_8146B24
.4byte sub_8146D90
.4byte sub_8146B7C
.4byte sub_8146BA8
.align 2
sPhase2_Transition_PokeballsTrail_Funcs:: @ 85C8B7C
.4byte sub_8146FCC
.4byte sub_8147018
.4byte sub_81470A4
.align 1
sUnknown_085C8B88:: @ 85C8B88
.2byte 0xfff0, 0x0100
.align 1
sUnknown_085C8B8C:: @ 85C8B8C
.2byte 0x0000, 0x0020, 0x0040, 0x0012, 0x0030
.align 1
sUnknown_085C8B96:: @ 85C8B96
.2byte 0x0008, 0xfff8, 0x0000
.align 2
sPhase2_Transition_Clockwise_BlackFade_Funcs:: @ 85C8B9C
.4byte sub_814723C
.4byte sub_81472A4
.4byte sub_8147334
.4byte sub_8147428
.4byte sub_81474B0
.4byte sub_81475B0
.4byte sub_8147648
.align 2
sPhase2_Transition_Ripple_Funcs:: @ 85C8BB8
.4byte sub_8147750
.4byte sub_81477A8
.align 2
sPhase2_Transition_Wave_Funcs:: @ 85C8BC0
.4byte sub_8147924
.4byte sub_814797C
.4byte sub_8147A18
.align 2
sPhase2_Mugshot_Transition_Funcs:: @ 85C8BCC
.4byte sub_8147BBC
.4byte sub_8147C24
.4byte sub_8147CE4
.4byte sub_8147DD0
.4byte sub_8147E4C
.4byte sub_8147E88
.4byte sub_8147F40
.4byte sub_8148008
.4byte sub_8148040
.4byte sub_814808C
sMugshotsTrainerPicIDsTable:: @ 85C8BF4
.byte 0x24, 0x25, 0x26, 0x27, 0x36, 0x00
.align 1
sMugshotsOpponentRotationScales:: @ 85C8BFA
.2byte 0x0200, 0x0200, 0x0200, 0x0200, 0x01b0, 0x01b0, 0x01a0, 0x01a0, 0x0188, 0x0188
.align 1
sMugshotsOpponentCoords:: @ 85C8C0E
.2byte 0x0000, 0x0000, 0x0000, 0x0000, 0xfffc, 0x0004, 0x0000, 0x0005, 0xfff8, 0x0007, 0x0000
.align 2
sUnknown_085C8C24:: @ 85C8C24
.4byte sub_81483A8
.4byte sub_81483AC
.4byte sub_81483F8
.4byte sub_814842C
.4byte sub_81483A8
.4byte sub_8148458
.4byte sub_81483A8
.align 1
sUnknown_085C8C40:: @ 85C8C40
.2byte 0x000c, 0xfff4
.align 1
sUnknown_085C8C44:: @ 85C8C44
.2byte 0xffff, 0x0001
.align 2
gUnknown_085C8C48:: @ 85C8C48
.4byte sub_8148508
.4byte sub_8148590
.4byte sub_814865C
.align 2
gUnknown_085C8C54:: @ 85C8C54
.4byte sub_8148798
.4byte sub_8148864
.4byte sub_8148AD4
.4byte sub_8148B14
.align 1
gUnknown_085C8C64:: @ 85C8C64
.2byte 0x7727
.align 1
gUnknown_085C8C66:: @ 85C8C66
.2byte 0x0001, 0xffff, 0x0000
.align 2
gUnknown_085C8C6C:: @ 85C8C6C
.4byte sub_8148BC4
.4byte sub_8148CE8
.4byte sub_8148C28
.align 2
gUnknown_085C8C78:: @ 85C8C78
.4byte sub_8148BC4
.4byte sub_8148D6C
.align 1
gUnknown_085C8C80:: @ 85C8C80
.2byte 0xfffa, 0x0004
.align 2
gUnknown_085C8C84:: @ 85C8C84
.4byte sub_8148E8C
.4byte sub_8148F4C
.4byte sub_8149008
gUnknown_085C8C90:: @ 85C8C90
.2byte 0x0001, 0x001b, 0x0113, 0xffff
gUnknown_085C8C98:: @ 85C8C98
.2byte 0x0002, 0x01e6, 0xffff
gUnknown_085C8C9E:: @ 85C8C9E
.2byte 0x0003, 0x0106, 0xffff
gUnknown_085C8CA4:: @ 85C8CA4
.2byte 0x0004, 0x01fb, 0xfffe
gUnknown_085C8CAA:: @ 85C8CAA
.2byte 0x0001, 0x00d5, 0xffff
gUnknown_085C8CB0:: @ 85C8CB0
.2byte 0x0002, 0x0224, 0xfffe
gUnknown_085C8CB6:: @ 85C8CB6
.2byte 0x0003, 0x00c4, 0xffff
gUnknown_085C8CBC:: @ 85C8CBC
.2byte 0x0004, 0x023d, 0x0135, 0xffff
gUnknown_085C8CC4:: @ 85C8CC4
.2byte 0x0001, 0x01da, 0xffff
gUnknown_085C8CCA:: @ 85C8CCA
.2byte 0x0002, 0x0127, 0x0020, 0xffff
gUnknown_085C8CD2:: @ 85C8CD2
.2byte 0x0003, 0x003a, 0xffff
gUnknown_085C8CD8:: @ 85C8CD8
.2byte 0x0004, 0x01c7, 0xffff
gUnknown_085C8CDE:: @ 85C8CDE
.2byte 0x0001, 0x021c, 0xffff
gUnknown_085C8CE4:: @ 85C8CE4
.2byte 0x0002, 0x00e5, 0xffff
gUnknown_085C8CEA:: @ 85C8CEA
.2byte 0x0003, 0x00f4, 0x001c, 0xffff
gUnknown_085C8CF2:: @ 85C8CF2
.2byte 0x0004, 0x0205, 0xffff
.align 2
gUnknown_085C8CF8:: @ 85C8CF8
.4byte gUnknown_085C8C90
.4byte gUnknown_085C8CA4
.4byte gUnknown_085C8C98
.4byte gUnknown_085C8C9E
.4byte gUnknown_085C8CEA
.4byte gUnknown_085C8CE4
.4byte gUnknown_085C8CF2
.4byte gUnknown_085C8CDE
.align 2
gUnknown_085C8D18:: @ 85C8D18
.4byte gUnknown_085C8CBC
.4byte gUnknown_085C8CB0
.4byte gUnknown_085C8CB6
.4byte gUnknown_085C8CAA
.4byte gUnknown_085C8CCA
.4byte gUnknown_085C8CD8
.4byte gUnknown_085C8CC4
.4byte gUnknown_085C8CD2
.align 2
gUnknown_085C8D38:: @ 85C8D38
.4byte gUnknown_085C8CF8
.4byte gUnknown_085C8D18
.align 2
gUnknown_085C8D40:: @ 85C8D40
.4byte sub_8146DAC
.4byte sub_8146DD8
.4byte sub_8149178
.4byte sub_81491C8
.4byte sub_8149224
.4byte sub_8146D90
.4byte sub_8146B7C
.4byte sub_8146BA8
.align 2
gUnknown_085C8D60:: @ 85C8D60
.4byte sub_8146DAC
.4byte sub_8146DD8
.4byte sub_81492B4
.4byte sub_8149358
.4byte sub_8149388
.4byte sub_81493D8
.4byte sub_8149410
.4byte sub_814943C
.4byte sub_814946C
.4byte sub_8148CE8
.4byte sub_8148C28
.align 2
gUnknown_085C8D8C:: @ 85C8D8C
.4byte sub_81495B0
.4byte sub_8149628
.4byte sub_814969C
.4byte sub_81496D8
.4byte sub_8149740
.align 1
sUnknown_085C8DA0:: @ 85C8DA0
.2byte 0x0000, 0x0014, 0x000f, 0x0028, 0x000a, 0x0019, 0x0023, 0x0005
.align 2
sUnknown_085C8DB0:: @ 85C8DB0
.4byte sub_8149994
.4byte sub_81499E8
.4byte sub_8149A40
.align 2
sPhase2_Transition_Shards_Funcs:: @ 85C8DBC
.4byte sub_8149AA4
.4byte sub_8149B08
.4byte sub_8149B84
.4byte sub_8149C60
.4byte sub_8149CCC
.align 1
sUnknown_085C8DD0:: @ 85C8DD0
.2byte 0x0038, 0x0000, 0x0000, 0x00a0, 0x0000, 0x0068, 0x00a0, 0x00f0, 0x0058, 0x0001, 0x00f0, 0x0048, 0x0038, 0x0000, 0x0001, 0x0000
.2byte 0x0020, 0x0090, 0x00a0, 0x0000, 0x0090, 0x00a0, 0x00b8, 0x0000, 0x0001, 0x0038, 0x0000, 0x00a8, 0x00a0, 0x0000, 0x00a8, 0x00a0
.2byte 0x0030, 0x0000, 0x0001
.align 1
sUnknown_085C8E16:: @ 85C8E16
.2byte 0x0008, 0x0004, 0x0002, 0x0001, 0x0001, 0x0001, 0x0000
.align 2
sPhase1_TransitionAll_Funcs:: @ 85C8E24
.4byte sub_8149E34
.4byte sub_8149E90
.align 2
sSpriteImageTable_85C8E2C:: @ 85C8E2C
obj_frame_tiles sSpriteImage_85B98F0, 0x0200
.align 2
sSpriteAnim_85C8E34:: @ 85C8E34
obj_image_anim_frame 0, 1
obj_image_anim_end
.align 2
sSpriteAnimTable_85C8E3C:: @ 85C8E3C
.4byte sSpriteAnim_85C8E34
.align 2
sSpriteAffineAnim_85C8E40:: @ 85C8E40
obj_rot_scal_anim_frame 0, 0, -4, 1
obj_rot_scal_anim_jump 0
.align 2
sSpriteAffineAnim_85C8E50:: @ 85C8E50
obj_rot_scal_anim_frame 0, 0, 4, 1
obj_rot_scal_anim_jump 0
.align 2
sSpriteAffineAnimTable_85C8E60:: @ 85C8E60
.4byte sSpriteAffineAnim_85C8E40
.4byte sSpriteAffineAnim_85C8E50
.align 2
gUnknown_085C8E68:: @ 85C8E68
spr_template 0xffff, 0x1009, gFieldObjectBaseOam_32x32, sSpriteAnimTable_85C8E3C, sSpriteImageTable_85C8E2C, sSpriteAffineAnimTable_85C8E60, sub_814713C
.align 2
gOamData_85C8E80:: @ 85C8E80
.2byte 0x0000, 0xc000, 0x0000, 0x0000
.align 2
sSpriteImageTable_85C8E88:: @ 85C8E88
obj_frame_tiles sSpriteImage_85B9CD0, 0x0800
.align 2
sSpriteImageTable_85C8E90:: @ 85C8E90
obj_frame_tiles sSpriteImage_85BA4D0, 0x0800
.align 2
sSpriteAnim_85C8E98:: @ 85C8E98
obj_image_anim_frame 0, 1
obj_image_anim_end
.align 2
sSpriteAnimTable_85C8EA0:: @ 85C8EA0
.4byte sSpriteAnim_85C8E98
.align 2
sSpriteTemplate_85C8EA4:: @ 85C8EA4
spr_template 0xffff, 0x100a, gOamData_85C8E80, sSpriteAnimTable_85C8EA0, sSpriteImageTable_85C8E88, gDummySpriteAffineAnimTable, sub_8148380
.align 2
sSpriteTemplate_85C8EBC:: @ 85C8EBC
spr_template 0xffff, 0x100a, gOamData_85C8E80, sSpriteAnimTable_85C8EA0, sSpriteImageTable_85C8E90, gDummySpriteAffineAnimTable, sub_8148380
.align 2
gFieldEffectObjectPalette10:: @ 85C8ED4
.incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal"
.align 2
gFieldEffectObjectPaletteInfo10:: @ 85C8EF4
obj_pal gFieldEffectObjectPalette10, 0x1009
.align 2
sMugshotPal_Sidney:: @ 85C8EFC
.incbin "graphics/battle_transitions/sidney_bg.gbapal"
.align 2
sMugshotPal_Phoebe:: @ 85C8F1C
.incbin "graphics/battle_transitions/phoebe_bg.gbapal"
.align 2
sMugshotPal_Glacia:: @ 85C8F3C
.incbin "graphics/battle_transitions/glacia_bg.gbapal"
.align 2
sMugshotPal_Drake:: @ 85C8F5C
.incbin "graphics/battle_transitions/drake_bg.gbapal"
.align 2
sMugshotPal_Wallace:: @ 85C8F7C
.incbin "graphics/battle_transitions/wallace_bg.gbapal"
.align 2
sMugshotPal_Brendan:: @ 85C8F9C
.incbin "graphics/battle_transitions/brendan_bg.gbapal"
.align 2
sMugshotPal_May:: @ 85C8EFC
.incbin "graphics/battle_transitions/may_bg.gbapal"
.align 2
sOpponentMugshotsPals:: @ 85C8FDC
.4byte sMugshotPal_Sidney
.4byte sMugshotPal_Phoebe
.4byte sMugshotPal_Glacia
.4byte sMugshotPal_Drake
.4byte sMugshotPal_Wallace
.align 2
sPlayerMugshotsPals:: @ 85C8FF0
.4byte sMugshotPal_Brendan
.4byte sMugshotPal_May
.align 2
sUnusedTrainerPalette:: @ 85C8EF8
.incbin "graphics/battle_transitions/unused_trainer.gbapal"
.align 2
sSpritePalette_UnusedTrainer:: @ 85C8EFC
obj_pal sUnusedTrainerPalette, 0x100A
.align 2
sBigPokeball_Tilemap:: @ 85C9020
.incbin "graphics/battle_transitions/big_pokeball_map.bin"
.align 2
sMugshotsTilemap:: @ 85C94D0
.incbin "graphics/battle_transitions/elite_four_bg_map.bin"
.align 2
gUnknown_085C99D0:: @ 85C99D0
.4byte sub_814A324
.4byte sub_814A374
.4byte sub_8146BF8
.4byte sub_8146C8C
.4byte sub_8146D20
.4byte sub_8146DF8
.align 2
gUnknown_085C99E8:: @ 85C99E8
.4byte sub_814A42C
.4byte sub_814A4D4
.4byte sub_814A500
.4byte sub_814A550
.align 2
gUnknown_085C99F8:: @ 85C99F8
.4byte sub_814A798
.4byte sub_814A828
.4byte sub_814A898
.4byte sub_814ABA0
.align 2
gUnknown_085C9A08:: @ 85C9A08
.4byte sub_814A960
.4byte sub_814AA04
.4byte sub_814AA84
.4byte sub_814AAB8
.4byte sub_814ABA0
.align 2
gUnknown_085C9A1C:: @ 85C9A1C
.4byte sub_814AC38
.4byte sub_814AD48
.4byte sub_814ADB4
.4byte sub_814ADD8
.4byte sub_814AE40
gUnknown_085C9A30:: @ 85C9A30
.byte 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x1b, 0x14, 0x0d, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x07, 0x0e, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x13, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x0f
.byte 0x10, 0x11, 0x12
gUnknown_085C9A53:: @ 85C9A53
.byte 0x00, 0x10, 0x29, 0x16, 0x2c, 0x02, 0x2b, 0x15, 0x2e, 0x1b, 0x09, 0x30, 0x26, 0x05, 0x39, 0x3b, 0x0c, 0x3f, 0x23, 0x1c, 0x0a, 0x35, 0x07, 0x31, 0x27, 0x17, 0x37, 0x01, 0x3e, 0x11, 0x3d, 0x1e
.byte 0x06, 0x22, 0x0f, 0x33, 0x20, 0x3a, 0x0d, 0x2d, 0x25, 0x34, 0x0b, 0x18, 0x3c, 0x13, 0x38, 0x21, 0x1d, 0x32, 0x28, 0x36, 0x0e, 0x03, 0x2f, 0x14, 0x12, 0x19, 0x04, 0x24, 0x1a, 0x2a, 0x1f, 0x08
.byte 0x00
data/berry_tag_screen.s
+1 -1
View File
@@ -23,7 +23,7 @@ gUnknown_085EFD28:: @ 85EFD28
window_template 0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055 window_template 0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055
window_template 0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d window_template 0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d
window_template 0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101 window_template 0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101
window_template_terminator null_window_template
.align 2 .align 2
gBerryFirmnessStringPointers:: @ 85EFD50 gBerryFirmnessStringPointers:: @ 85EFD50
data/contest.s
+53 -7
View File
@@ -1,5 +1,7 @@
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.include "constants/species_constants.inc"
.include "include/constants/moves.h"
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
@@ -295,19 +297,63 @@ gUnknown_08587F44:: @ 8587F44
window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da
window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec
window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee
window_template_terminator null_window_template
.align 2 .align 2
gUnknown_08587FA4:: @ 8587FA4 gUnknown_08587FA4:: @ 8587FA4
.incbin "baserom.gba", 0x587fa4, 0x100 .4byte NULL, 0xFFFF
.2byte SPECIES_ELECTRIKE
.byte 2
.string "ELECTER$", 11
.string "EZRA$", 8
.2byte 0
.4byte NULL, 0xFFFF
.2byte SPECIES_TROPIUS
.byte 0
.string "TROPO$", 11
.string "ALLAN$", 8
.2byte 2
.4byte NULL, 0xFFFF
.2byte SPECIES_XATU
.byte 1
.string "TUXA$", 11
.string "JULIET$", 8
.2byte 0
.4byte NULL, 0xFFFF
.2byte SPECIES_PLUSLE
.byte 4
.string "PULSE$", 11
.string "BAILY$", 8
.2byte 3
.4byte NULL, 0xFFFF
.2byte SPECIES_SHUPPET
.byte 3
.string "SHUPUP$", 11
.string "MELANY$", 8
.2byte 1
.4byte NULL, 0xFFFF
.2byte SPECIES_ZANGOOSE
.byte 0
.string "GOOZAN$", 11
.string "HANA$", 8
.2byte 2
.4byte NULL, 0xFFFF
.2byte SPECIES_LOUDRED
.byte 1
.string "LOUDED$", 11
.string "BRYANT$", 8
.2byte 2
.4byte NULL, 0xFFFF
.2byte SPECIES_DELCATTY
.byte 2
.string "KITSY$", 11
.string "OMAR$", 8
.2byte 3
.align 2 .align 2
gUnknown_085880A4:: @ 85880A4 gUnknown_085880A4:: @ 85880A4
.incbin "baserom.gba", 0x5880a4, 0x1740 .include "data/contest_opponents.inc"
.align 2
gUnknown_085897E4:: @ 85897E4
.incbin "baserom.gba", 0x5897e4, 0xc0
gUnknown_085898A4:: @ 85898A4 gUnknown_085898A4:: @ 85898A4
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
data/contest_link_80F57C4.s
+1 -1
View File
@@ -68,7 +68,7 @@ gUnknown_0858D898:: @ 858D898
window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a
window_template 0x01, 0x07, 0x0a, 0x0c, 0x02, 0x0f, 0x0332 window_template 0x01, 0x07, 0x0a, 0x0c, 0x02, 0x0f, 0x0332
window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a
window_template_terminator null_window_template
.align 2 .align 2
gUnknown_0858D8C0:: @ 858D8C0 gUnknown_0858D8C0:: @ 858D8C0
data/contest_opponents.inc
+2114
View File
File diff suppressed because it is too large Load Diff
data/credits.s
+1 -1
View File
@@ -1493,7 +1493,7 @@ gUnknown_085E6F68:: @ 85E6F68 struct BgTemplate
.align 2 .align 2
gUnknown_085E6F6C:: @ 85E6F6C gUnknown_085E6F6C:: @ 85E6F6C
window_template 0x00, 0x00, 0x09, 0x1e, 0x0c, 0x08, 0x0001 window_template 0x00, 0x00, 0x09, 0x1e, 0x0c, 0x08, 0x0001
window_template_terminator null_window_template
.align 2 .align 2
gUnknown_085E6F7C:: @ 85E6F7C gUnknown_085E6F7C:: @ 85E6F7C
data/data2b.s
+2 -2
View File
@@ -4711,7 +4711,7 @@ gUnknown_0831AA18:: @ 831AA18
window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0 window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0 window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0 window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
window_template_terminator null_window_template
.align 2 .align 2
gUnknown_0831AAE0:: @ 831AAE0 gUnknown_0831AAE0:: @ 831AAE0
@@ -4738,7 +4738,7 @@ gUnknown_0831AAE0:: @ 831AAE0
window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148 window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090 window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
window_template_terminator null_window_template
.align 2 .align 2
gUnknown_0831ABA0:: @ 831ABA0 gUnknown_0831ABA0:: @ 831ABA0
data/easy_chat.s
+1 -1
View File
@@ -273,7 +273,7 @@ gUnknown_08597C64:: @ 8597C64
window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010 window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a
window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000 window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000
window_template_terminator null_window_template
.align 2 .align 2
gUnknown_08597C84:: @ 8597C84 gUnknown_08597C84:: @ 8597C84
data/event_scripts.s
+109 -1
View File
@@ -7,6 +7,7 @@
.include "asm/macros.inc" .include "asm/macros.inc"
.include "asm/macros/event.inc" .include "asm/macros/event.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section script_data, "aw", %progbits .section script_data, "aw", %progbits
@@ -1770,7 +1771,7 @@ EventScript_271D92:: @ 8271D92
EventScript_271DAC:: @ 8271DAC EventScript_271DAC:: @ 8271DAC
message gUnknown_0827266F message gUnknown_0827266F
waitmessage waitmessage
special sp109_CreatePCMenu special ScrSpecial_CreatePCMenu
waitstate waitstate
goto EventScript_271DBC goto EventScript_271DBC
end end
@@ -8912,6 +8913,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "You’re an inspiration!\n" .string "You’re an inspiration!\n"
.string "See you again!$" .string "See you again!$"
gText_Mom_Pokenav_2B227B:: @ 82B227B
.string "MOM: Your father and you…\n" .string "MOM: Your father and you…\n"
.string "Everyone is captivated by POKéMON.\p" .string "Everyone is captivated by POKéMON.\p"
.string "What is the charm of POKéMON?\p" .string "What is the charm of POKéMON?\p"
@@ -8919,6 +8921,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "I adore POKéMON that help me with\l" .string "I adore POKéMON that help me with\l"
.string "my everyday chores.$" .string "my everyday chores.$"
gText_Mom_Pokenav_2B2310:: @ 82B2310
.string "MOM: Hi, {PLAYER}!\n" .string "MOM: Hi, {PLAYER}!\n"
.string "Your father keeps himself locked\l" .string "Your father keeps himself locked\l"
.string "away in the PETALBURG GYM.\p" .string "away in the PETALBURG GYM.\p"
@@ -8928,11 +8931,13 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "I’m guessing that losing to you\n" .string "I’m guessing that losing to you\n"
.string "was a big blow to his pride!$" .string "was a big blow to his pride!$"
gText_Mom_Pokenav_2B23F3:: @ 82B23F3
.string "MOM: {PLAYER}…\n" .string "MOM: {PLAYER}…\n"
.string "Don’t worry about me or the house.\p" .string "Don’t worry about me or the house.\p"
.string "Wear those RUNNING SHOES until\n" .string "Wear those RUNNING SHOES until\n"
.string "they fall apart, honey!$" .string "they fall apart, honey!$"
gText_Roxanne_Pokenav_2B2456:: @ 82B2456
.string "ROXANNE: Oh, hello, {PLAYER}!\p" .string "ROXANNE: Oh, hello, {PLAYER}!\p"
.string "I’ve been hard at work retraining\n" .string "I’ve been hard at work retraining\n"
.string "since we met.\p" .string "since we met.\p"
@@ -8941,6 +8946,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But when I do, please visit my GYM\n" .string "But when I do, please visit my GYM\n"
.string "for a rematch!$" .string "for a rematch!$"
gText_Roxanne_Pokenav_2B250E:: @ 82B250E
.string "ROXANNE: Is this {PLAYER}?\n" .string "ROXANNE: Is this {PLAYER}?\n"
.string "Congratulations!\l" .string "Congratulations!\l"
.string "I’ve been hearing about you!\p" .string "I’ve been hearing about you!\p"
@@ -8949,15 +8955,18 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But when I do, please visit my GYM\n" .string "But when I do, please visit my GYM\n"
.string "for a rematch!$" .string "for a rematch!$"
gText_Roxanne_Pokenav_2B25C1:: @ 82B25C1
.string "ROXANNE: {PLAYER}!\n" .string "ROXANNE: {PLAYER}!\n"
.string "My GYM is ready!\p" .string "My GYM is ready!\p"
.string "Please visit RUSTBORO whenever\n" .string "Please visit RUSTBORO whenever\n"
.string "you can!$" .string "you can!$"
gText_Roxanne_Pokenav_2B2607:: @ 82B2607
.string "ROXANNE: At the RUSTBORO GYM,\n" .string "ROXANNE: At the RUSTBORO GYM,\n"
.string "the fact that we battled, {PLAYER},\l" .string "the fact that we battled, {PLAYER},\l"
.string "is a matter of pride.$" .string "is a matter of pride.$"
gText_Brawly_Pokenav_2B2659:: @ 82B2659
.string "BRAWLY: Hey, there, {PLAYER}{STRING 5}!\p" .string "BRAWLY: Hey, there, {PLAYER}{STRING 5}!\p"
.string "I learned a lot from the battle we\n" .string "I learned a lot from the battle we\n"
.string "had together.\p" .string "had together.\p"
@@ -8968,6 +8977,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But if I can reopen the GYM,\n" .string "But if I can reopen the GYM,\n"
.string "I want you to challenge us again.$" .string "I want you to challenge us again.$"
gText_Brawly_Pokenav_2B275D:: @ 82B275D
.string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n" .string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n"
.string "Congratulations!\p" .string "Congratulations!\p"
.string "Word about your exploits arrived\n" .string "Word about your exploits arrived\n"
@@ -8979,14 +8989,17 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But if I can reopen the GYM,\n" .string "But if I can reopen the GYM,\n"
.string "I want you to challenge us again.$" .string "I want you to challenge us again.$"
gText_Brawly_Pokenav_2B286F:: @ 82B286F
.string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n" .string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n"
.string "My GYM’s ready for action!\p" .string "My GYM’s ready for action!\p"
.string "Come back to DEWFORD anytime\n" .string "Come back to DEWFORD anytime\n"
.string "for another challenge!$" .string "for another challenge!$"
gText_Brawly_Pokenav_2B28D1:: @ 82B28D1
.string "BRAWLY: {PLAYER}{STRING 5}, I don’t think\n" .string "BRAWLY: {PLAYER}{STRING 5}, I don’t think\n"
.string "I’ll ever get bored of battling you!$" .string "I’ll ever get bored of battling you!$"
gText_Wattson_Pokenav_2B2912:: @ 82B2912
.string "WATTSON: Oh, it’s you!\p" .string "WATTSON: Oh, it’s you!\p"
.string "After you left, I’ve been redoing\n" .string "After you left, I’ve been redoing\n"
.string "my training from scratch.\p" .string "my training from scratch.\p"
@@ -8995,6 +9008,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "You’ll have to wait till then!\n" .string "You’ll have to wait till then!\n"
.string "Wahahahaha!$" .string "Wahahahaha!$"
gText_Wattson_Pokenav_2B29CA:: @ 82B29CA
.string "WATTSON: Wahahahaha!\p" .string "WATTSON: Wahahahaha!\p"
.string "You’ve really done it, haven’t you?\n" .string "You’ve really done it, haven’t you?\n"
.string "I’ve been getting word about you!\p" .string "I’ve been getting word about you!\p"
@@ -9005,15 +9019,18 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "You’ll have to wait till then!\n" .string "You’ll have to wait till then!\n"
.string "Wahahahaha!$" .string "Wahahahaha!$"
gText_Wattson_Pokenav_2B2AB6:: @ 82B2AB6
.string "WATTSON: Oh, it’s you!\n" .string "WATTSON: Oh, it’s you!\n"
.string "My GYM’s ready!\p" .string "My GYM’s ready!\p"
.string "Visit MAUVILLE anytime!\n" .string "Visit MAUVILLE anytime!\n"
.string "Wahahahaha!$" .string "Wahahahaha!$"
gText_Wattson_Pokenav_2B2B01:: @ 82B2B01
.string "WATTSON: Wahahaha!\p" .string "WATTSON: Wahahaha!\p"
.string "A battle with you is always charged\n" .string "A battle with you is always charged\n"
.string "with shocking power!$" .string "with shocking power!$"
gText_Flannery_Pokenav_2B2B4D:: @ 82B2B4D
.string "FLANNERY: {PLAYER}…\p" .string "FLANNERY: {PLAYER}…\p"
.string "When we battled, I learned exactly\n" .string "When we battled, I learned exactly\n"
.string "how immature I was.\p" .string "how immature I was.\p"
@@ -9023,6 +9040,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "When the time comes, {PLAYER},\n" .string "When the time comes, {PLAYER},\n"
.string "please challenge us again.$" .string "please challenge us again.$"
gText_Flannery_Pokenav_2B2C0E:: @ 82B2C0E
.string "FLANNERY: Hello, {PLAYER}?\n" .string "FLANNERY: Hello, {PLAYER}?\n"
.string "Congratulations!\p" .string "Congratulations!\p"
.string "Word of your success has reached\n" .string "Word of your success has reached\n"
@@ -9033,37 +9051,44 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "appear beside my name in the\l" .string "appear beside my name in the\l"
.string "MATCH CALL list.$" .string "MATCH CALL list.$"
gText_Flannery_Pokenav_2B2CF1:: @ 82B2CF1
.string "FLANNERY: Oh, {PLAYER}?\n" .string "FLANNERY: Oh, {PLAYER}?\n"
.string "Our GYM’s ready!\p" .string "Our GYM’s ready!\p"
.string "Come to LAVARIDGE for a soak\n" .string "Come to LAVARIDGE for a soak\n"
.string "in the hot spring and a challenge!$" .string "in the hot spring and a challenge!$"
gText_Flannery_Pokenav_2B2D54:: @ 82B2D54
.string "FLANNERY: {PLAYER}…\n" .string "FLANNERY: {PLAYER}…\n"
.string "I’m positive that you keep getting\l" .string "I’m positive that you keep getting\l"
.string "better at training every time.$" .string "better at training every time.$"
gText_Winona_Pokenav_2B2DA4:: @ 82B2DA4
.string "WINONA: Hello, {PLAYER}!\p" .string "WINONA: Hello, {PLAYER}!\p"
.string "Thanks to our battle, I’ve come\n" .string "Thanks to our battle, I’ve come\n"
.string "to understand my weak points!\p" .string "to understand my weak points!\p"
.string "When I reopen the GYM, I won’t go\n" .string "When I reopen the GYM, I won’t go\n"
.string "down in defeat again!$" .string "down in defeat again!$"
gText_Winona_Pokenav_2B2E2B:: @ 82B2E2B
.string "WINONA: You’ve done it, {PLAYER}!\p" .string "WINONA: You’ve done it, {PLAYER}!\p"
.string "News about the new CHAMPION\n" .string "News about the new CHAMPION\n"
.string "has reached us in FORTREE!\p" .string "has reached us in FORTREE!\p"
.string "But… The next time we battle,\n" .string "But… The next time we battle,\n"
.string "it’s not going to end the same way.$" .string "it’s not going to end the same way.$"
gText_Winona_Pokenav_2B2EC2:: @ 82B2EC2
.string "WINONA: Is this {PLAYER}?\n" .string "WINONA: Is this {PLAYER}?\n"
.string "Our GYM is back in operation!\p" .string "Our GYM is back in operation!\p"
.string "We’re waiting for you in FORTREE!$" .string "We’re waiting for you in FORTREE!$"
gText_Winona_Pokenav_2B2F16:: @ 82B2F16
.string "WINONA: {PLAYER}…\n" .string "WINONA: {PLAYER}…\n"
.string "Though I have lost, my wings will\l" .string "Though I have lost, my wings will\l"
.string "never break.\p" .string "never break.\p"
.string "Yes, in exactly the same way that\n" .string "Yes, in exactly the same way that\n"
.string "you never lost sight of your dream.$" .string "you never lost sight of your dream.$"
gText_TateLiza_Pokenav_2B2F97:: @ 82B2F97
.string "TATE: Oh! You’re…\n" .string "TATE: Oh! You’re…\n"
.string "LIZA: {PLAYER}!\p" .string "LIZA: {PLAYER}!\p"
.string "TATE: We’re in training again…\n" .string "TATE: We’re in training again…\n"
@@ -9073,6 +9098,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "TATE: A mark’ll appear by our name…\n" .string "TATE: A mark’ll appear by our name…\n"
.string "LIZA: On the MATCH CALL list.$" .string "LIZA: On the MATCH CALL list.$"
gText_TateLiza_Pokenav_2B306E:: @ 82B306E
.string "TATE: {PLAYER}, congratulations!\n" .string "TATE: {PLAYER}, congratulations!\n"
.string "LIZA: {PLAYER}, congratulations!\p" .string "LIZA: {PLAYER}, congratulations!\p"
.string "TATE: The two of us are…\n" .string "TATE: The two of us are…\n"
@@ -9082,6 +9108,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "TATE: A mark’ll appear by our name…\n" .string "TATE: A mark’ll appear by our name…\n"
.string "LIZA: On the MATCH CALL list.$" .string "LIZA: On the MATCH CALL list.$"
gText_TateLiza_Pokenav_2B3158:: @ 82B3158
.string "TATE: {PLAYER}!\n" .string "TATE: {PLAYER}!\n"
.string "LIZA: {PLAYER}!\p" .string "LIZA: {PLAYER}!\p"
.string "TATE: Our GYM is ready!\n" .string "TATE: Our GYM is ready!\n"
@@ -9089,11 +9116,13 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "TATE: Please come visit…\n" .string "TATE: Please come visit…\n"
.string "LIZA: MOSSDEEP anytime!$" .string "LIZA: MOSSDEEP anytime!$"
gText_TateLiza_Pokenav_2B31CD:: @ 82B31CD
.string "TATE: {PLAYER}, the battle we had…\n" .string "TATE: {PLAYER}, the battle we had…\n"
.string "LIZA: Is an invaluable experience.\p" .string "LIZA: Is an invaluable experience.\p"
.string "TATE: It would be nice if…\n" .string "TATE: It would be nice if…\n"
.string "LIZA: We could all battle again!$" .string "LIZA: We could all battle again!$"
gText_Juan_Pokenav_2B3249:: @ 82B3249
.string "JUAN: Hmm…\n" .string "JUAN: Hmm…\n"
.string "{PLAYER}{STRING 5}… Was it?\p" .string "{PLAYER}{STRING 5}… Was it?\p"
.string "Our battle together--it brought\n" .string "Our battle together--it brought\n"
@@ -9102,6 +9131,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Perhaps you are a genius who may\n" .string "Perhaps you are a genius who may\n"
.string "yet surpass WALLACE!$" .string "yet surpass WALLACE!$"
gText_Juan_Pokenav_2B32EC:: @ 82B32EC
.string "JUAN: Fufu… {PLAYER}{STRING 5}…\n" .string "JUAN: Fufu… {PLAYER}{STRING 5}…\n"
.string "You’ve finally achieved your goal.\p" .string "You’ve finally achieved your goal.\p"
.string "My eye for appraising talent wasn’t\n" .string "My eye for appraising talent wasn’t\n"
@@ -9110,12 +9140,14 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "you, for you have scaled the peak\l" .string "you, for you have scaled the peak\l"
.string "of power and prestige.$" .string "of power and prestige.$"
gText_Juan_Pokenav_2B33AA:: @ 82B33AA
.string "JUAN: Hoho… {PLAYER}{STRING 5}…\p" .string "JUAN: Hoho… {PLAYER}{STRING 5}…\p"
.string "Our SOOTOPOLIS GYM has finally\n" .string "Our SOOTOPOLIS GYM has finally\n"
.string "reopened.\p" .string "reopened.\p"
.string "If you wish to see me, you are\n" .string "If you wish to see me, you are\n"
.string "welcome to visit anytime.$" .string "welcome to visit anytime.$"
gText_Juan_Pokenav_2B341E:: @ 82B341E
.string "JUAN: {PLAYER}{STRING 5}…\p" .string "JUAN: {PLAYER}{STRING 5}…\p"
.string "Like the finest music, the battles\n" .string "Like the finest music, the battles\n"
.string "we wage together strike chords\l" .string "we wage together strike chords\l"
@@ -9123,6 +9155,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "When I close my eyes, I see visions\n" .string "When I close my eyes, I see visions\n"
.string "of you soaring with the melody…$" .string "of you soaring with the melody…$"
gText_Sidney_Pokenav_2B34CC:: @ 82B34CC
.string "SIDNEY: Yo, {PLAYER}!\p" .string "SIDNEY: Yo, {PLAYER}!\p"
.string "If you want to battle with me\n" .string "If you want to battle with me\n"
.string "again, you come on back whenever\l" .string "again, you come on back whenever\l"
@@ -9130,6 +9163,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "I’ll always be here!\n" .string "I’ll always be here!\n"
.string "I’ll be waiting!$" .string "I’ll be waiting!$"
gText_Phoebe_Pokenav_2B3561:: @ 82B3561
.string "PHOEBE: Hi, {PLAYER}!\p" .string "PHOEBE: Hi, {PLAYER}!\p"
.string "How about coming back here again\n" .string "How about coming back here again\n"
.string "sometime?\p" .string "sometime?\p"
@@ -9137,6 +9171,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "your bond has grown with your\l" .string "your bond has grown with your\l"
.string "POKéMON.$" .string "POKéMON.$"
gText_Glacia_Pokenav_2B35E4:: @ 82B35E4
.string "GLACIA: Hello, {PLAYER}.\p" .string "GLACIA: Hello, {PLAYER}.\p"
.string "I trust you haven’t become\n" .string "I trust you haven’t become\n"
.string "complacent with your power?\p" .string "complacent with your power?\p"
@@ -9144,6 +9179,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "hot emotions just a little, do come\l" .string "hot emotions just a little, do come\l"
.string "to the POKéMON LEAGUE…$" .string "to the POKéMON LEAGUE…$"
gText_Drake_Pokenav_2B368B:: @ 82B368B
.string "DRAKE: That voice… {PLAYER}, is it?\n" .string "DRAKE: That voice… {PLAYER}, is it?\n"
.string "You sound well…\p" .string "You sound well…\p"
.string "I understand that there is now\n" .string "I understand that there is now\n"
@@ -9155,6 +9191,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "the POKéMON LEAGUE!\p" .string "the POKéMON LEAGUE!\p"
.string "Don’t you agree, {PLAYER}?$" .string "Don’t you agree, {PLAYER}?$"
gText_Wallace_Pokenav_2B3790:: @ 82B3790
.string "WALLACE: Hello, {PLAYER}{STRING 5}.\n" .string "WALLACE: Hello, {PLAYER}{STRING 5}.\n"
.string "Have you met STEVEN?\p" .string "Have you met STEVEN?\p"
.string "He is…\n" .string "He is…\n"
@@ -9197,12 +9234,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "… … … … … …\n" .string "… … … … … …\n"
.string "… … … … … Click!$" .string "… … … … … Click!$"
gText_May_Pokenav_2B3AB3:: @ 2B3AB3
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "MR. BRINEY retired as a SAILOR,\n" .string "MR. BRINEY retired as a SAILOR,\n"
.string "but I still see him out on the sea\l" .string "but I still see him out on the sea\l"
.string "with his pet PEEKO sometimes.\p" .string "with his pet PEEKO sometimes.\p"
.string "He must love the sea still.$" .string "He must love the sea still.$"
gText_May_Pokenav_2B3B3F:: @ 2B3B3F
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "You know how little towns like\n" .string "You know how little towns like\n"
.string "PETALBURG and DEWFORD have GYMS?\p" .string "PETALBURG and DEWFORD have GYMS?\p"
@@ -9211,6 +9250,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "When they finally build a GYM there,\n" .string "When they finally build a GYM there,\n"
.string "I should apply to be the LEADER.$" .string "I should apply to be the LEADER.$"
gText_May_Pokenav_2B3C13:: @ 2B3C13
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "Do you remember a man named\n" .string "Do you remember a man named\n"
.string "the CUTTER in RUSTBORO?\l" .string "the CUTTER in RUSTBORO?\l"
@@ -9222,11 +9262,13 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "… … … … … …\p" .string "… … … … … …\p"
.string "The ROCK SMASH GUY!$" .string "The ROCK SMASH GUY!$"
gText_May_Pokenav_2B3CF3:: @ 2B3CF3
.string "MAY: {PLAYER}{STRING 5}?\p" .string "MAY: {PLAYER}{STRING 5}?\p"
.string "RUSTURF TUNNEL…\n" .string "RUSTURF TUNNEL…\n"
.string "They named it that because it\l" .string "They named it that because it\l"
.string "joins RUSTBORO and VERDANTURF.$" .string "joins RUSTBORO and VERDANTURF.$"
gText_May_Pokenav_2B3D4B:: @ 2B3D4B
.string "MAY: {PLAYER}{STRING 5}, how are you?\p" .string "MAY: {PLAYER}{STRING 5}, how are you?\p"
.string "I’m out on ROUTE 111 now.\p" .string "I’m out on ROUTE 111 now.\p"
.string "I’m going to get a rest at an old\n" .string "I’m going to get a rest at an old\n"
@@ -9234,6 +9276,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "She lives just north of\n" .string "She lives just north of\n"
.string "the desert.$" .string "the desert.$"
gText_May_Pokenav_2B3DD1:: @ 2B3DD1
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "Did you know about the MIRAGE\n" .string "Did you know about the MIRAGE\n"
.string "TOWER in the desert?\p" .string "TOWER in the desert?\p"
@@ -9241,18 +9284,21 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "to mysteriously come and go.\p" .string "to mysteriously come and go.\p"
.string "I wish I could see it.$" .string "I wish I could see it.$"
gText_May_Pokenav_2B3E69:: @ 2B3E69
.string "MAY: {PLAYER}{STRING 5}, yahoo!\n" .string "MAY: {PLAYER}{STRING 5}, yahoo!\n"
.string "I’m on ROUTE 119 now.\p" .string "I’m on ROUTE 119 now.\p"
.string "There’s a big river here, and\n" .string "There’s a big river here, and\n"
.string "it often rains.\p" .string "it often rains.\p"
.string "I got soaked!$" .string "I got soaked!$"
gText_May_Pokenav_2B3ECD:: @ 2B3ECD
.string "MAY: {PLAYER}{STRING 5}, hi.\p" .string "MAY: {PLAYER}{STRING 5}, hi.\p"
.string "MT. PYRE is a memorial to POKéMON\n" .string "MT. PYRE is a memorial to POKéMON\n"
.string "whose lives have ended.\p" .string "whose lives have ended.\p"
.string "Maybe as a result, it’s infested\n" .string "Maybe as a result, it’s infested\n"
.string "with many GHOST-type POKéMON!$" .string "with many GHOST-type POKéMON!$"
gText_May_Pokenav_2B3F2B:: @ 2B3F2B
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "I was thinking of going to the hot\n" .string "I was thinking of going to the hot\n"
.string "spring in LAVARIDGE.\p" .string "spring in LAVARIDGE.\p"
@@ -9260,12 +9306,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "PASS, I ran into some bad-looking\l" .string "PASS, I ran into some bad-looking\l"
.string "characters. The mood was ugly!$" .string "characters. The mood was ugly!$"
gText_May_Pokenav_2B3FFB:: @ 2B3FFB
.string "MAY: Hi, {PLAYER}{STRING 5}!\n" .string "MAY: Hi, {PLAYER}{STRING 5}!\n"
.string "Did you see the news?\p" .string "Did you see the news?\p"
.string "They say CAPT. STERN discovered\n" .string "They say CAPT. STERN discovered\n"
.string "the SEAFLOOR CAVERN while on his\l" .string "the SEAFLOOR CAVERN while on his\l"
.string "submarine expedition.$" .string "submarine expedition.$"
gText_May_Pokenav_2B402B:: @ 2B402B
.string "MAY: Hi, {PLAYER}{STRING 5}!\n" .string "MAY: Hi, {PLAYER}{STRING 5}!\n"
.string "Don’t you think it’s neat?\p" .string "Don’t you think it’s neat?\p"
.string "Even if you don’t have a boat,\n" .string "Even if you don’t have a boat,\n"
@@ -9275,6 +9323,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "There’s a POKéMON move that lets\n" .string "There’s a POKéMON move that lets\n"
.string "you go to the bottom of the sea.$" .string "you go to the bottom of the sea.$"
gText_May_Pokenav_2B414B:: @ 2B414B
.string "MAY: Hi, {PLAYER}{STRING 5}!\n" .string "MAY: Hi, {PLAYER}{STRING 5}!\n"
.string "Hope things are okay!\p" .string "Hope things are okay!\p"
.string "Have you been on the sea and\n" .string "Have you been on the sea and\n"
@@ -9285,6 +9334,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "When you get to the other side,\n" .string "When you get to the other side,\n"
.string "come up to the surface. Easy!$" .string "come up to the surface. Easy!$"
gText_May_Pokenav_2B4228:: @ 2B4228
.string "MAY: Hi, {PLAYER}{STRING 5}!\p" .string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "How’s it going?\n" .string "How’s it going?\n"
.string "Are you filling your POKéDEX?\p" .string "Are you filling your POKéDEX?\p"
@@ -9293,6 +9343,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "And there are three of them!\p" .string "And there are three of them!\p"
.string "I would love to see even one…$" .string "I would love to see even one…$"
gText_May_Pokenav_2B42E0:: @ 2B42E0
.string "MAY: {PLAYER}{STRING 5}!\n" .string "MAY: {PLAYER}{STRING 5}!\n"
.string "I heard the rumors!\p" .string "I heard the rumors!\p"
.string "You beat the SOOTOPOLIS GYM\n" .string "You beat the SOOTOPOLIS GYM\n"
@@ -9300,6 +9351,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "That means you don’t have far\n" .string "That means you don’t have far\n"
.string "to go, do you?$" .string "to go, do you?$"
gText_May_Pokenav_2B4350:: @ 2B4350
.string "MAY: There isn’t a single TRAINER\n" .string "MAY: There isn’t a single TRAINER\n"
.string "left in HOENN who doesn’t know who\l" .string "left in HOENN who doesn’t know who\l"
.string "you are, {PLAYER}{STRING 5}!\p" .string "you are, {PLAYER}{STRING 5}!\p"
@@ -9307,6 +9359,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "with you, {PLAYER}{STRING 5}, they’re all\l" .string "with you, {PLAYER}{STRING 5}, they’re all\l"
.string "surprised!$" .string "surprised!$"
gText_Brendan_Pokenav_2B43EF:: @ 2B43EF
.string "BRENDAN: Hey, {PLAYER}!\p" .string "BRENDAN: Hey, {PLAYER}!\p"
.string "MR. BRINEY retired as a SAILOR,\n" .string "MR. BRINEY retired as a SAILOR,\n"
.string "but I still see him out on the sea\l" .string "but I still see him out on the sea\l"
@@ -9314,6 +9367,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "I guess he must love\n" .string "I guess he must love\n"
.string "the sea still.$" .string "the sea still.$"
gText_Brendan_Pokenav_2B4486:: @ 2B4486
.string "BRENDAN: Hey, {PLAYER}!\p" .string "BRENDAN: Hey, {PLAYER}!\p"
.string "I don’t get how little towns like\n" .string "I don’t get how little towns like\n"
.string "PETALBURG and DEWFORD have GYMS.\p" .string "PETALBURG and DEWFORD have GYMS.\p"
@@ -9322,6 +9376,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "When they finally build a GYM there,\n" .string "When they finally build a GYM there,\n"
.string "I should apply to be the LEADER.$" .string "I should apply to be the LEADER.$"
gText_Brendan_Pokenav_2B4560:: @ 2B4560
.string "BRENDAN: Yo, {PLAYER}!\p" .string "BRENDAN: Yo, {PLAYER}!\p"
.string "Do you remember a guy named\n" .string "Do you remember a guy named\n"
.string "the CUTTER in RUSTBORO?\l" .string "the CUTTER in RUSTBORO?\l"
@@ -9333,12 +9388,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "… … … … … …\p" .string "… … … … … …\p"
.string "The ROCK SMASH GUY!$" .string "The ROCK SMASH GUY!$"
gText_Brendan_Pokenav_2B463F:: @ 2B463F
.string "BRENDAN: This voice… {PLAYER}?\p" .string "BRENDAN: This voice… {PLAYER}?\p"
.string "They gave RUSTURF TUNNEL its name\n" .string "They gave RUSTURF TUNNEL its name\n"
.string "because it joins RUSTBORO and\l" .string "because it joins RUSTBORO and\l"
.string "VERDANTURF.\p" .string "VERDANTURF.\p"
.string "Did you know that?$" .string "Did you know that?$"
gText_Brendan_Pokenav_2B46B7:: @ 2B46B7
.string "BRENDAN: {PLAYER}, what’s up?\p" .string "BRENDAN: {PLAYER}, what’s up?\p"
.string "Hey, I’m out on ROUTE 111 now.\p" .string "Hey, I’m out on ROUTE 111 now.\p"
.string "I’m going to rest up at an old\n" .string "I’m going to rest up at an old\n"
@@ -9346,6 +9403,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "If you’re in the area, you should\n" .string "If you’re in the area, you should\n"
.string "visit her, too.$" .string "visit her, too.$"
gText_Brendan_Pokenav_2B4761:: @ 2B4761
.string "BRENDAN: Hey, {PLAYER}!\p" .string "BRENDAN: Hey, {PLAYER}!\p"
.string "Did you know about the MIRAGE\n" .string "Did you know about the MIRAGE\n"
.string "TOWER in the desert?\p" .string "TOWER in the desert?\p"
@@ -9353,18 +9411,21 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "seen only sometimes.\p" .string "seen only sometimes.\p"
.string "I’d like to see that!$" .string "I’d like to see that!$"
gText_Brendan_Pokenav_2B47F4:: @ 2B47F4
.string "BRENDAN: Who’s this? Oh, {PLAYER}?\n" .string "BRENDAN: Who’s this? Oh, {PLAYER}?\n"
.string "Guess what? I’m on ROUTE 119 now.\p" .string "Guess what? I’m on ROUTE 119 now.\p"
.string "There’s a big river here, and\n" .string "There’s a big river here, and\n"
.string "it rains all the time.\p" .string "it rains all the time.\p"
.string "I got soaked to the bone!$" .string "I got soaked to the bone!$"
gText_Brendan_Pokenav_2B4882:: @ 2B4882
.string "BRENDAN: {PLAYER}!\p" .string "BRENDAN: {PLAYER}!\p"
.string "MT. PYRE is a memorial to POKéMON\n" .string "MT. PYRE is a memorial to POKéMON\n"
.string "whose lives have ended.\p" .string "whose lives have ended.\p"
.string "That’s probably why it’s infested\n" .string "That’s probably why it’s infested\n"
.string "with many GHOST-type POKéMON!$" .string "with many GHOST-type POKéMON!$"
gText_Brendan_Pokenav_2B4909:: @ 2B4909
.string "BRENDAN: Hey there, {PLAYER}.\p" .string "BRENDAN: Hey there, {PLAYER}.\p"
.string "I was on my way back to the hot\n" .string "I was on my way back to the hot\n"
.string "spring in LAVARIDGE.\p" .string "spring in LAVARIDGE.\p"
@@ -9373,12 +9434,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Those creeps…\n" .string "Those creeps…\n"
.string "I think they were TEAM MAGMA.$" .string "I think they were TEAM MAGMA.$"
gText_Brendan_Pokenav_2B49C4:: @ 2B49C4
.string "BRENDAN: Hi, {PLAYER}!\n" .string "BRENDAN: Hi, {PLAYER}!\n"
.string "Did you catch the news?\p" .string "Did you catch the news?\p"
.string "They say CAPT. STERN discovered\n" .string "They say CAPT. STERN discovered\n"
.string "the SEAFLOOR CAVERN while on his\l" .string "the SEAFLOOR CAVERN while on his\l"
.string "submarine expedition.$" .string "submarine expedition.$"
gText_Brendan_Pokenav_2B4A44:: @ 2B4A44
.string "BRENDAN: Hey there, {PLAYER}!\n" .string "BRENDAN: Hey there, {PLAYER}!\n"
.string "Don’t you think it’s awesome?\p" .string "Don’t you think it’s awesome?\p"
.string "Even if you don’t have a boat,\n" .string "Even if you don’t have a boat,\n"
@@ -9388,6 +9451,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "travel to the bottom of the sea.\p" .string "travel to the bottom of the sea.\p"
.string "Man, POKéMON can do anything!$" .string "Man, POKéMON can do anything!$"
gText_Brendan_Pokenav_2B4B28:: @ 2B4B28
.string "BRENDAN: Howdy, {PLAYER}!\n" .string "BRENDAN: Howdy, {PLAYER}!\n"
.string "How are you holding up?\p" .string "How are you holding up?\p"
.string "Ever found your way to the other\n" .string "Ever found your way to the other\n"
@@ -9397,6 +9461,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "When you get to the other side,\n" .string "When you get to the other side,\n"
.string "come up to the surface. Simple!$" .string "come up to the surface. Simple!$"
gText_Brendan_Pokenav_2B4C15:: @ 2B4C15
.string "BRENDAN: Hey there, {PLAYER}!\p" .string "BRENDAN: Hey there, {PLAYER}!\p"
.string "How’s it going? Filling up your\n" .string "How’s it going? Filling up your\n"
.string "POKéDEX successfully?\p" .string "POKéDEX successfully?\p"
@@ -9405,12 +9470,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "And not just one--three!\p" .string "And not just one--three!\p"
.string "I’d love to catch even one…$" .string "I’d love to catch even one…$"
gText_Brendan_Pokenav_2B4CD8:: @ 2B4CD8
.string "BRENDAN: {PLAYER}!\n" .string "BRENDAN: {PLAYER}!\n"
.string "I heard the rumors!\p" .string "I heard the rumors!\p"
.string "You beat the SOOTOPOLIS GYM\n" .string "You beat the SOOTOPOLIS GYM\n"
.string "LEADER? Awesome!\p" .string "LEADER? Awesome!\p"
.string "You’re getting awful close now!$" .string "You’re getting awful close now!$"
gText_Brendan_Pokenav_2B4D46:: @ 2B4D46
.string "BRENDAN: There isn’t a TRAINER in\n" .string "BRENDAN: There isn’t a TRAINER in\n"
.string "all of HOENN who doesn’t know who\l" .string "all of HOENN who doesn’t know who\l"
.string "you are, {PLAYER}!\p" .string "you are, {PLAYER}!\p"
@@ -9418,16 +9485,19 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "with you, {PLAYER}, they get pretty\l" .string "with you, {PLAYER}, they get pretty\l"
.string "envious!$" .string "envious!$"
gText_Wally_Pokenav_2B4DE2:: @ 2B4DE2
.string "WALLY: Oh, {PLAYER}!\p" .string "WALLY: Oh, {PLAYER}!\p"
.string "I’ve been getting healthier and\n" .string "I’ve been getting healthier and\n"
.string "more physically fit.\p" .string "more physically fit.\p"
.string "I hope I can become a TRAINER like\n" .string "I hope I can become a TRAINER like\n"
.string "you soon, {PLAYER}!$" .string "you soon, {PLAYER}!$"
gText_Wally_Pokenav_2B4E57:: @ 2B4E57
.string "WALLY: {PLAYER}, hello!\p" .string "WALLY: {PLAYER}, hello!\p"
.string "After RUSTURF TUNNEL went\n" .string "After RUSTURF TUNNEL went\n"
.string "through, WANDA’s been very happy!$" .string "through, WANDA’s been very happy!$"
gText_Wally_Pokenav_2B4EA5:: @ 2B4EA5
.string "WALLY: Oh, {PLAYER}!\p" .string "WALLY: Oh, {PLAYER}!\p"
.string "I… I left my uncle’s place in\n" .string "I… I left my uncle’s place in\n"
.string "VERDANTURF without telling anyone.\p" .string "VERDANTURF without telling anyone.\p"
@@ -9435,6 +9505,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "{PLAYER}, you understand how\n" .string "{PLAYER}, you understand how\n"
.string "I feel, don’t you?$" .string "I feel, don’t you?$"
gText_Wally_Pokenav_2B4F41:: @ 2B4F41
.string "WALLY: {PLAYER}?\n" .string "WALLY: {PLAYER}?\n"
.string "It’s me, WALLY!\p" .string "It’s me, WALLY!\p"
.string "The world of TRAINERS is amazing!\p" .string "The world of TRAINERS is amazing!\p"
@@ -9443,6 +9514,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "It’s as if everyone’s getting\n" .string "It’s as if everyone’s getting\n"
.string "connected through POKéMON!$" .string "connected through POKéMON!$"
gText_Wally_Pokenav_2B4FF3:: @ 2B4FF3
.string "WALLY: {PLAYER}? It’s awesome!\n" .string "WALLY: {PLAYER}? It’s awesome!\n"
.string "That RALTS we caught together?\l" .string "That RALTS we caught together?\l"
.string "It evolved, {PLAYER}!\p" .string "It evolved, {PLAYER}!\p"
@@ -9452,11 +9524,13 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "After all, it’s the POKéMON that\n" .string "After all, it’s the POKéMON that\n"
.string "should be praised!$" .string "should be praised!$"
gText_Wally_Pokenav_2B50B1:: @ 2B50B1
.string "… … … … … …\n" .string "… … … … … …\n"
.string "… … … … … …\p" .string "… … … … … …\p"
.string "WALLY appears to be out of\n" .string "WALLY appears to be out of\n"
.string "the POKéNAV’s service area…$" .string "the POKéNAV’s service area…$"
gText_Wally_Pokenav_2B5100:: @ 2B5100
.string "WALLY: Oh, {PLAYER}!\p" .string "WALLY: Oh, {PLAYER}!\p"
.string "Before I met you, I hardly ever\n" .string "Before I met you, I hardly ever\n"
.string "left my house…\p" .string "left my house…\p"
@@ -9465,6 +9539,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "{PLAYER}…\n" .string "{PLAYER}…\n"
.string "Thank you…$" .string "Thank you…$"
gText_Scott_Pokenav_2B5184:: @ 2B5184
.string "SCOTT: Howdy, {PLAYER}{STRING 5}!\p" .string "SCOTT: Howdy, {PLAYER}{STRING 5}!\p"
.string "You know how POKéMON can be found\n" .string "You know how POKéMON can be found\n"
.string "everywhere?\p" .string "everywhere?\p"
@@ -9475,6 +9550,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "As a result, I have to hurry\n" .string "As a result, I have to hurry\n"
.string "everywhere, too. Busy, busy!$" .string "everywhere, too. Busy, busy!$"
gText_Scott_Pokenav_2B5275:: @ 2B5275
.string "SCOTT: I’m on ROUTE 119 right now.\n" .string "SCOTT: I’m on ROUTE 119 right now.\n"
.string "It’s teeming with TRAINERS!\p" .string "It’s teeming with TRAINERS!\p"
.string "It’s also overgrown with tall grass\n" .string "It’s also overgrown with tall grass\n"
@@ -9482,6 +9558,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Walking around in shorts here\n" .string "Walking around in shorts here\n"
.string "makes me all ticklish!$" .string "makes me all ticklish!$"
gText_Scott_Pokenav_2B5323:: @ 2B5323
.string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p" .string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p"
.string "Have you had the chance to climb\n" .string "Have you had the chance to climb\n"
.string "MT. PYRE?\p" .string "MT. PYRE?\p"
@@ -9490,6 +9567,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "It’s somewhere every TRAINER\n" .string "It’s somewhere every TRAINER\n"
.string "should climb to the top of once.$" .string "should climb to the top of once.$"
gText_Scott_Pokenav_2B53DB:: @ 2B53DB
.string "SCOTT: Hi, {PLAYER}{STRING 5}!\p" .string "SCOTT: Hi, {PLAYER}{STRING 5}!\p"
.string "I’ve been hearing about these odd\n" .string "I’ve been hearing about these odd\n"
.string "gangs being a nuisance.\p" .string "gangs being a nuisance.\p"
@@ -9499,6 +9577,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "skilled TRAINERS among them.\p" .string "skilled TRAINERS among them.\p"
.string "…But if they’re thugs…$" .string "…But if they’re thugs…$"
gText_Scott_Pokenav_2B54A5:: @ 2B54A5
.string "SCOTT: Oh, hi, {PLAYER}{STRING 5}.\p" .string "SCOTT: Oh, hi, {PLAYER}{STRING 5}.\p"
.string "Might there be tough TRAINERS\n" .string "Might there be tough TRAINERS\n"
.string "at the bottom of the sea?\p" .string "at the bottom of the sea?\p"
@@ -9506,6 +9585,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "I can’t swim, for one.\l" .string "I can’t swim, for one.\l"
.string "And I don’t raise POKéMON…$" .string "And I don’t raise POKéMON…$"
gText_Scott_Pokenav_2B5541:: @ 2B5541
.string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p" .string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p"
.string "You know that you can challenge\n" .string "You know that you can challenge\n"
.string "the POKéMON LEAGUE when you’ve\l" .string "the POKéMON LEAGUE when you’ve\l"
@@ -9522,17 +9602,20 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "the POKéMON LEAGUE into the HALL\l" .string "the POKéMON LEAGUE into the HALL\l"
.string "OF FAME!$" .string "OF FAME!$"
gText_Scott_Pokenav_2B56CA:: @ 2B56CA
.string "… … … … … …\n" .string "… … … … … …\n"
.string "… … … … … …\p" .string "… … … … … …\p"
.string "SCOTT appears to be out of\n" .string "SCOTT appears to be out of\n"
.string "the POKéNAV’s service area…$" .string "the POKéNAV’s service area…$"
gText_Norman_Pokenav_2B5719:: @ 82B5719
.string "DAD: In RUSTBORO, there’s a man\n" .string "DAD: In RUSTBORO, there’s a man\n"
.string "that goes by the odd name of\l" .string "that goes by the odd name of\l"
.string "the CUTTER.\p" .string "the CUTTER.\p"
.string "If you’re in the area, you should\n" .string "If you’re in the area, you should\n"
.string "pay him a visit.$" .string "pay him a visit.$"
gText_Norman_Pokenav_2B5795:: @ 82B5795
.string "DAD: Hm… Little by little, but also\n" .string "DAD: Hm… Little by little, but also\n"
.string "very surely, you’re getting\l" .string "very surely, you’re getting\l"
.string "tougher, {PLAYER}.\p" .string "tougher, {PLAYER}.\p"
@@ -9541,6 +9624,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "and me…\p" .string "and me…\p"
.string "This feeling is hard to explain.$" .string "This feeling is hard to explain.$"
gText_Norman_Pokenav_2B584D:: @ 82B584D
.string "DAD: I see…\n" .string "DAD: I see…\n"
.string "You’ve collected four GYM BADGES…\p" .string "You’ve collected four GYM BADGES…\p"
.string "There’s no avoiding it now.\n" .string "There’s no avoiding it now.\n"
@@ -9548,6 +9632,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Come anytime.\n" .string "Come anytime.\n"
.string "We’ll all be waiting for you!$" .string "We’ll all be waiting for you!$"
gText_Norman_Pokenav_2B58E3:: @ 82B58E3
.string "DAD: {PLAYER}! You’d better go visit\n" .string "DAD: {PLAYER}! You’d better go visit\n"
.string "Mother every so often.\p" .string "Mother every so often.\p"
.string "I’m going to remain here and\n" .string "I’m going to remain here and\n"
@@ -9555,23 +9640,27 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "The way of battling is deep\n" .string "The way of battling is deep\n"
.string "and unforgiving!$" .string "and unforgiving!$"
gText_Norman_Pokenav_2B5979:: @ 82B5979
.string "DAD: Oh, hi, {PLAYER}!\p" .string "DAD: Oh, hi, {PLAYER}!\p"
.string "What’s that? MAGMA EMBLEM?\n" .string "What’s that? MAGMA EMBLEM?\n"
.string "I don’t know what that’s about.\p" .string "I don’t know what that’s about.\p"
.string "But with a name like that, it may\n" .string "But with a name like that, it may\n"
.string "be somehow linked to a volcano!$" .string "be somehow linked to a volcano!$"
gText_Norman_Pokenav_2B5A07:: @ 82B5A07
.string "DAD: Hiyah! Haah! Dwah!\p" .string "DAD: Hiyah! Haah! Dwah!\p"
.string "…Oh? {PLAYER}!\p" .string "…Oh? {PLAYER}!\p"
.string "You caught me right in the middle\n" .string "You caught me right in the middle\n"
.string "of a POKéMON training session!$" .string "of a POKéMON training session!$"
gText_Norman_Pokenav_2B5A69:: @ 82B5A69
.string "DAD: {PLAYER}!\p" .string "DAD: {PLAYER}!\p"
.string "Who would’ve thought you’d become\n" .string "Who would’ve thought you’d become\n"
.string "the POKéMON LEAGUE CHAMPION…\p" .string "the POKéMON LEAGUE CHAMPION…\p"
.string "Okay!\n" .string "Okay!\n"
.string "I won’t be left behind!$" .string "I won’t be left behind!$"
gText_Norman_Pokenav_2B5ACF:: @ 82B5ACF
.string "DAD: Hm? {PLAYER}?\n" .string "DAD: Hm? {PLAYER}?\n"
.string "What good timing!\p" .string "What good timing!\p"
.string "This time, I’m going to challenge\n" .string "This time, I’m going to challenge\n"
@@ -9579,9 +9668,11 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "I’m waiting in the PETALBURG GYM.\n" .string "I’m waiting in the PETALBURG GYM.\n"
.string "Accept my challenge anytime!$" .string "Accept my challenge anytime!$"
gText_Norman_Pokenav_2B5B5E:: @ 82B5B5E
.string "DAD: …You amaze me, {PLAYER}.\n" .string "DAD: …You amaze me, {PLAYER}.\n"
.string "How much higher will you soar?$" .string "How much higher will you soar?$"
gText_Steven_Pokenav_2B5B95:: @ 82B5B95
.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
.string "Have you been to MAUVILLE\n" .string "Have you been to MAUVILLE\n"
.string "already?\p" .string "already?\p"
@@ -9592,12 +9683,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "You may make a new discovery\n" .string "You may make a new discovery\n"
.string "there.$" .string "there.$"
gText_Steven_Pokenav_2B5C53:: @ 82B5C53
.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
.string "I’ve met a lot of different\n" .string "I’ve met a lot of different\n"
.string "TRAINERS so far.\p" .string "TRAINERS so far.\p"
.string "But you’re one of a kind.\n" .string "But you’re one of a kind.\n"
.string "You’re not like anyone else.$" .string "You’re not like anyone else.$"
gText_Steven_Pokenav_2B5CC9:: @ 82B5CC9
.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p" .string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
.string "When you’re on an adventure with\n" .string "When you’re on an adventure with\n"
.string "your POKéMON, what do you think?\p" .string "your POKéMON, what do you think?\p"
@@ -9608,6 +9701,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Depending on how you think, your\n" .string "Depending on how you think, your\n"
.string "adventure’s significance changes.$" .string "adventure’s significance changes.$"
gText_Steven_Pokenav_2B5DB4:: @ 82B5DB4
.string "STEVEN: Hello?\n" .string "STEVEN: Hello?\n"
.string "{PLAYER}{STRING 5}?\p" .string "{PLAYER}{STRING 5}?\p"
.string "I’m involved in a spot of trouble\n" .string "I’m involved in a spot of trouble\n"
@@ -9615,6 +9709,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "I’m sorry, but I can’t talk now.\n" .string "I’m sorry, but I can’t talk now.\n"
.string "Bye!$" .string "Bye!$"
gText_Steven_Pokenav_2B5E26:: @ 82B5E26
.string "STEVEN: Oh!\n" .string "STEVEN: Oh!\n"
.string "{PLAYER}{STRING 5}!\p" .string "{PLAYER}{STRING 5}!\p"
.string "There’s no need to talk.\n" .string "There’s no need to talk.\n"
@@ -9622,10 +9717,12 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "You have to believe in yourself\n" .string "You have to believe in yourself\n"
.string "and do what’s right.$" .string "and do what’s right.$"
gText_Steven_Pokenav_2B5EA2:: @ 82B5EA2
.string "… … … … … …\p" .string "… … … … … …\p"
.string "STEVEN appears not to be getting\n" .string "STEVEN appears not to be getting\n"
.string "the call…$" .string "the call…$"
gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9
.string "STEVEN: {PLAYER}{STRING 5}… Congratulations\n" .string "STEVEN: {PLAYER}{STRING 5}… Congratulations\n"
.string "for entering the HALL OF FAME.\p" .string "for entering the HALL OF FAME.\p"
.string "… … … … … …\n" .string "… … … … … …\n"
@@ -9652,6 +9749,7 @@ Route101_Text_2B603A: @ 82B603A
.string "the POKéDEX and POKéNAV, studying\l" .string "the POKéDEX and POKéNAV, studying\l"
.string "POKéMON becomes more fun, eh?$" .string "POKéMON becomes more fun, eh?$"
gText_MrStone_Pokenav_2B60C0:: @ 82B60C0
.string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p" .string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p"
.string "Since you called me, the POKéNAV\n" .string "Since you called me, the POKéNAV\n"
.string "must be working properly!\p" .string "must be working properly!\p"
@@ -9666,6 +9764,7 @@ Route101_Text_2B603A: @ 82B603A
.string "Wahahaha!\n" .string "Wahahaha!\n"
.string "See you again!$" .string "See you again!$"
gText_MrStone_Pokenav_2B61E6:: @ 82B61E6
.string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p" .string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p"
.string "What’s wrong? Have you forgotten\n" .string "What’s wrong? Have you forgotten\n"
.string "about that little errand of mine?\p" .string "about that little errand of mine?\p"
@@ -9677,6 +9776,7 @@ Route101_Text_2B603A: @ 82B603A
.string "Now, since I am a busy PRESIDENT,\n" .string "Now, since I am a busy PRESIDENT,\n"
.string "I have to go! Bye-bye!$" .string "I have to go! Bye-bye!$"
gText_MrStone_Pokenav_2B6302:: @ 82B6302
.string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p" .string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p"
.string "Ah, so you’ve met STEVEN!\n" .string "Ah, so you’ve met STEVEN!\n"
.string "I’d better reward you, then!\p" .string "I’d better reward you, then!\p"
@@ -9684,6 +9784,7 @@ Route101_Text_2B603A: @ 82B603A
.string "come see me at my office.\p" .string "come see me at my office.\p"
.string "I’ll be waiting for you!$" .string "I’ll be waiting for you!$"
gText_MrStone_Pokenav_2B63A0:: @ 82B63A0
.string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p" .string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p"
.string "Did you know that DEVON was\n" .string "Did you know that DEVON was\n"
.string "digging the RUSTURF TUNNEL?\p" .string "digging the RUSTURF TUNNEL?\p"
@@ -9694,12 +9795,14 @@ Route101_Text_2B603A: @ 82B603A
.string "live in peace than worry about our\l" .string "live in peace than worry about our\l"
.string "own convenience.$" .string "own convenience.$"
gText_MrStone_Pokenav_2B64A2:: @ 82B64A2
.string "MR. STONE: Hello, hello, {PLAYER}{STRING 5}!\p" .string "MR. STONE: Hello, hello, {PLAYER}{STRING 5}!\p"
.string "I heard from someone in PETALBURG\n" .string "I heard from someone in PETALBURG\n"
.string "that you’re NORMAN’s child!\p" .string "that you’re NORMAN’s child!\p"
.string "No wonder you’re such a capable\n" .string "No wonder you’re such a capable\n"
.string "being!$" .string "being!$"
gText_MrStone_Pokenav_2B6526:: @ 82B6526
.string "MR. STONE: What’s that?\p" .string "MR. STONE: What’s that?\p"
.string "You battled your own father and\n" .string "You battled your own father and\n"
.string "defeated him?\p" .string "defeated him?\p"
@@ -9707,6 +9810,7 @@ Route101_Text_2B603A: @ 82B603A
.string "I had no idea that I befriended\n" .string "I had no idea that I befriended\n"
.string "someone so special! Wahaha!$" .string "someone so special! Wahaha!$"
gText_MrStone_Pokenav_2B65BB:: @ 82B65BB
.string "Hello!\n" .string "Hello!\n"
.string "This is DEVON CORPORATI…\l" .string "This is DEVON CORPORATI…\l"
.string "Oh, hello, {PLAYER}!\p" .string "Oh, hello, {PLAYER}!\p"
@@ -9715,18 +9819,21 @@ Route101_Text_2B603A: @ 82B603A
.string "Our PRESIDENT is busy, but you\n" .string "Our PRESIDENT is busy, but you\n"
.string "seem to be just as busy, {PLAYER}.$" .string "seem to be just as busy, {PLAYER}.$"
gText_MrStone_Pokenav_2B6664:: @ 82B6664
.string "…Huh? …What’s that?\p" .string "…Huh? …What’s that?\p"
.string "GROU… Yes? …DON?\p" .string "GROU… Yes? …DON?\p"
.string "You’re breaking up…\n" .string "You’re breaking up…\n"
.string "…can’t hear…\p" .string "…can’t hear…\p"
.string "BZZZZ…$" .string "BZZZZ…$"
gText_MrStone_Pokenav_2B66B1:: @ 82B66B1
.string "…Huh? …What’s that?\p" .string "…Huh? …What’s that?\p"
.string "Seaflo… Yes? …Caver…?\p" .string "Seaflo… Yes? …Caver…?\p"
.string "You’re breaking up…\n" .string "You’re breaking up…\n"
.string "…can’t hear…\p" .string "…can’t hear…\p"
.string "BZZZZ…$" .string "BZZZZ…$"
gText_MrStone_Pokenav_2B6703:: @ 82B6703
.string "MR. STONE: {PLAYER}{STRING 5}! It’s me!\p" .string "MR. STONE: {PLAYER}{STRING 5}! It’s me!\p"
.string "You were apparently involved in all\n" .string "You were apparently involved in all\n"
.string "sorts of things, but I, being busy,\l" .string "sorts of things, but I, being busy,\l"
@@ -9736,6 +9843,7 @@ Route101_Text_2B603A: @ 82B603A
.string "I’ll always be in your corner!\n" .string "I’ll always be in your corner!\n"
.string "Take care!$" .string "Take care!$"
gText_MrStone_Pokenav_2B67ED:: @ 82B67ED
.string "MR. STONE: … … … … … …\n" .string "MR. STONE: … … … … … …\n"
.string "Is this maybe {PLAYER}{STRING 5}?\p" .string "Is this maybe {PLAYER}{STRING 5}?\p"
.string "Your voice is so full of confidence,\n" .string "Your voice is so full of confidence,\n"
data/field_effect.s
+301 -56
View File
@@ -8,51 +8,88 @@
gNewGameBirchPic:: @ 8553A90 gNewGameBirchPic:: @ 8553A90
.incbin "graphics/birch_speech/birch.4bpp" .incbin "graphics/birch_speech/birch.4bpp"
.incbin "baserom.gba", 0x554290, 0x66c0 .space 0x3800
.incbin "graphics/unused/intro_birch_beauty.4bpp"
.align 2 .align 2
gNewGameBirchPalette:: @ 855A950 gNewGameBirchPalette:: @ 855A950
.incbin "graphics/birch_speech/birch.gbapal" .incbin "graphics/birch_speech/birch.gbapal"
.align 2 .align 2
.incbin "baserom.gba", 0x55a970, 0x20 gSpriteImage_855A970:: @ 855A970
.incbin "graphics/misc/pokeball_glow.4bpp"
.align 2 .align 2
gFieldEffectObjectPalette4:: @ 855A990 gFieldEffectObjectPalette4:: @ 855A990
.incbin "graphics/map_objects/palettes/field_effect_object_palette_04.gbapal" .incbin "graphics/map_objects/palettes/field_effect_object_palette_04.gbapal"
.incbin "baserom.gba", 0x55a9b0, 0x480 .align 2
gSpriteImage_855A9B0:: @ 855A9B0
.incbin "graphics/misc/pokecenter_monitor/0.4bpp"
.align 2
gSpriteImage_855AA70:: @ 855AA70
.incbin "graphics/misc/pokecenter_monitor/1.4bpp"
.align 2
gSpriteImage_855AB30:: @ 855AB30
.incbin "graphics/misc/big_hof_monitor.4bpp"
.align 2
gSpriteImage_855AD30:: @ 855AD30
.incbin "graphics/misc/small_hof_monitor.4bpp"
.align 2 .align 2
gFieldEffectObjectPalette5:: @ 855AE30 gFieldEffectObjectPalette5:: @ 855AE30
.incbin "graphics/map_objects/palettes/field_effect_object_palette_05.gbapal" .incbin "graphics/map_objects/palettes/field_effect_object_palette_05.gbapal"
.align 2
gUnknown_0855AE50:: @ 855AE50 gUnknown_0855AE50:: @ 855AE50
.incbin "baserom.gba", 0x55ae50, 0x200 .incbin "graphics/misc/field_move_streaks.4bpp"
.align 2
gUnknown_0855B050:: @ 855B050 gUnknown_0855B050:: @ 855B050
.incbin "baserom.gba", 0x55b050, 0x20 .incbin "graphics/misc/field_move_streaks.gbapal"
.align 2
gUnknown_0855B070:: @ 855B070 gUnknown_0855B070:: @ 855B070
.incbin "baserom.gba", 0x55b070, 0x280 .incbin "graphics/misc/field_move_streaks_map.bin"
.align 2
gUnknown_0855B2F0:: @ 855B2F0 gUnknown_0855B2F0:: @ 855B2F0
.incbin "baserom.gba", 0x55b2f0, 0x80 .incbin "graphics/misc/darkness_field_move_streaks.4bpp"
.align 2
gUnknown_0855B370:: @ 855B370 gUnknown_0855B370:: @ 855B370
.incbin "baserom.gba", 0x55b370, 0x20 .incbin "graphics/misc/darkness_field_move_streaks.gbapal"
.align 2
gUnknown_0855B390:: @ 855B390 gUnknown_0855B390:: @ 855B390
.incbin "baserom.gba", 0x55b390, 0x280 .incbin "graphics/misc/darkness_field_move_streaks_map.bin"
.align 2
gUnknown_0855B610:: @ 855B610 gUnknown_0855B610:: @ 855B610
.incbin "baserom.gba", 0x55b610, 0x20 .incbin "graphics/misc/spotlight.gbapal"
.align 2
gUnknown_0855B630:: @ 855B630 gUnknown_0855B630:: @ 855B630
.incbin "baserom.gba", 0x55b630, 0xbc0 .incbin "graphics/misc/spotlight.4bpp"
.align 2
gUnknown_0855C170:: @ 855C170
.incbin "graphics/unknown/unknown_55C170.4bpp"
.align 2
gUnknown_0855C1F0:: @ 855C1F0 gUnknown_0855C1F0:: @ 855C1F0
.incbin "baserom.gba", 0x55c1f0, 0x20 .4byte FieldEffectCmd_loadtiles
.4byte FieldEffectCmd_loadfadedpal
.4byte FieldEffectCmd_loadpal
.4byte FieldEffectCmd_callnative
.4byte FieldEffectCmd_end
.4byte FieldEffectCmd_loadgfx_callnative
.4byte FieldEffectCmd_loadtiles_callnative
.4byte FieldEffectCmd_loadfadedpal_callnative
.align 2 .align 2
@ TODO: something else uses these too @ TODO: something else uses these too
@@ -61,7 +98,12 @@ gNewGameBirchOamAttributes:: @ 855C210
.2byte 0 .2byte 0
.align 2 .align 2
.incbin "baserom.gba", 0x55c218, 0x10 gOamData_855C218:: @ 855C218
.2byte 0x0000, 0x0000, 0x0000, 0x0000
.align 2
gOamData_855C220:: @ 855C220
.2byte 0x0000, 0x4000, 0x0000, 0x0000
.align 2 .align 2
gNewGameBirchPicTable:: @ 855C228 gNewGameBirchPicTable:: @ 855C228
@@ -82,13 +124,7 @@ gNewGameBirchImageAnimTable:: @ 855C240
.align 2 .align 2
gNewGameBirchObjectTemplate:: @ 855C244 gNewGameBirchObjectTemplate:: @ 855C244
.2byte 0xFFFF @ tiles tag spr_template 0xFFFF, 0x1006, gNewGameBirchOamAttributes, gNewGameBirchImageAnimTable, gNewGameBirchPicTable, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.2byte 0x1006 @ palette tag
.4byte gNewGameBirchOamAttributes
.4byte gNewGameBirchImageAnimTable
.4byte gNewGameBirchPicTable
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
.align 2 .align 2
gFieldEffectObjectPaletteInfo4:: @ 855C25C gFieldEffectObjectPaletteInfo4:: @ 855C25C
@@ -98,109 +134,318 @@ gFieldEffectObjectPaletteInfo4:: @ 855C25C
gFieldEffectObjectPaletteInfo5:: @ 855C264 gFieldEffectObjectPaletteInfo5:: @ 855C264
obj_pal gFieldEffectObjectPalette5, 0x1010 obj_pal gFieldEffectObjectPalette5, 0x1010
.incbin "baserom.gba", 0x55c26c, 0x40 .align 2
gOamData_855C26C:: @ 855C26C
.2byte 0x4000, 0x8000, 0x0000, 0x0000
.align 2
gUnknown_855C274:: @ 855C274
obj_frame_tiles gSpriteImage_855A970, 0x0020
.align 2
gUnknown_855C27C:: @ 855C27C
obj_frame_tiles gSpriteImage_855A9B0, 0x00c0
obj_frame_tiles gSpriteImage_855AA70, 0x00c0
.align 2
gUnknown_855C28C:: @ 855C28C
obj_frame_tiles gSpriteImage_855AB30, 0x0200
.align 2
gUnknown_855C294:: @ 855C294
obj_frame_tiles gSpriteImage_855AD30, 0x0200
.align 2
gSubspriteTable_855C29C:: @ 855C29C
subsprite -12, -8, 2, 0, 16x8
subsprite 4, -8, 2, 2, 8x8
subsprite -12, 0, 2, 3, 16x8
subsprite 4, 0, 2, 5, 8x8
.align 2
gUnknown_0855C2AC:: @ 855C2AC gUnknown_0855C2AC:: @ 855C2AC
.incbin "baserom.gba", 0x55c2ac, 0x18 .4byte 4, gSubspriteTable_855C29C
.align 2
gSubspriteTable_855C2B4:: @ 855C2B4
subsprite -32, -8, 2, 0, 32x8
subsprite 0, -8, 2, 4, 32x8
subsprite -32, 0, 2, 8, 32x8
subsprite 0, 0, 2, 12, 32x8
.align 2
gUnknown_0855C2C4:: @ 855C2C4 gUnknown_0855C2C4:: @ 855C2C4
.incbin "baserom.gba", 0x55c2c4, 0x40 .4byte 4, gSubspriteTable_855C2B4
.align 2
gUnknown_0855C2CC:: @ 855C2CC
.2byte 0x0000, 0x0001, 0xfffe, 0x0000
.align 2
gUnknown_0855C2D4:: @ 855C2D4
.2byte 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010
.2byte 0xffff, 0x0000
.align 2
gUnknown_0855C2F8:: @ 855C2F8
.4byte gUnknown_0855C2CC
.4byte gUnknown_0855C2D4
.align 2
gUnknown_0855C300:: @ 855C300
.4byte gUnknown_0855C2CC
.align 2
gUnknown_0855C304:: @ 855C304 gUnknown_0855C304:: @ 855C304
.incbin "baserom.gba", 0x55c304, 0x18 spr_template 0xffff, 0x1007, gOamData_855C218, gUnknown_0855C2F8, gUnknown_855C274, gDummySpriteAffineAnimTable, sub_80B6828
.align 2
gUnknown_0855C31C:: @ 855C31C gUnknown_0855C31C:: @ 855C31C
.incbin "baserom.gba", 0x55c31c, 0x18 spr_template 0xffff, 0x1004, gOamData_855C220, gUnknown_0855C2F8, gUnknown_855C27C, gDummySpriteAffineAnimTable, sub_80B68AC
.align 2
gUnknown_0855C334:: @ 855C334 gUnknown_0855C334:: @ 855C334
.incbin "baserom.gba", 0x55c334, 0x18 spr_template 0xffff, 0x1010, gOamData_855C220, gUnknown_0855C300, gUnknown_855C28C, gDummySpriteAffineAnimTable, sub_80B6970
.align 2
gUnknown_0855C34C:: @ 855C34C gUnknown_0855C34C:: @ 855C34C
.incbin "baserom.gba", 0x55c34c, 0x18 spr_template 0xffff, 0x1010, gOamData_855C26C, gUnknown_0855C300, gUnknown_855C294, gDummySpriteAffineAnimTable, sub_80B6970
.align 2
gUnknown_0855C364:: @ 855C364 gUnknown_0855C364:: @ 855C364
.incbin "baserom.gba", 0x55c364, 0x10 .4byte sub_80B6214
.4byte sub_80B6250
.4byte sub_80B628C
.4byte sub_80B62B4
.align 2
gUnknown_0855C374:: @ 855C374 gUnknown_0855C374:: @ 855C374
.incbin "baserom.gba", 0x55c374, 0x10 .4byte sub_80B6360
.4byte sub_80B63D4
.4byte sub_80B6404
.4byte sub_80B642C
.align 2
gUnknown_0855C384:: @ 855C384 gUnknown_0855C384:: @ 855C384
.incbin "baserom.gba", 0x55c384, 0x20 .4byte sub_80B64DC
.4byte sub_80B6574
.4byte sub_80B65A8
.4byte sub_80B66E8
.4byte sub_80B67DC
.4byte sub_80B67F8
.4byte sub_80B6800
.4byte nullsub_97
.align 1
gUnknown_0855C3A4:: @ 855C3A4 gUnknown_0855C3A4:: @ 855C3A4
.incbin "baserom.gba", 0x55c3a4, 0x18 .2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008
gUnknown_0855C3BC:: @ 855C3BC gUnknown_0855C3BC:: @ 855C3BC
.incbin "baserom.gba", 0x55c3bc, 0x4 .byte 0x10, 0x0c, 0x08, 0x00
gUnknown_0855C3C0:: @ 855C3C0 gUnknown_0855C3C0:: @ 855C3C0
.incbin "baserom.gba", 0x55c3c0, 0x4 .byte 0x10, 0x0c, 0x08, 0x00
gUnknown_0855C3C4:: @ 855C3C4 gUnknown_0855C3C4:: @ 855C3C4
.incbin "baserom.gba", 0x55c3c4, 0x4 .byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0855C3C8:: @ 855C3C8 gUnknown_0855C3C8:: @ 855C3C8
.incbin "baserom.gba", 0x55c3c8, 0x1c .4byte sub_80B6BCC
.4byte sub_80B6C74
.4byte sub_80B6C90
.4byte sub_80B6D04
.4byte sub_80B6DBC
.4byte sub_80B6DD8
.4byte sub_80B6E18
.align 2
gUnknown_0855C3E4:: @ 855C3E4 gUnknown_0855C3E4:: @ 855C3E4
.incbin "baserom.gba", 0x55c3e4, 0x18 .4byte sub_80B6EC0
.4byte sub_80B6EE0
.4byte sub_80B6F50
.4byte sub_80B6F74
.4byte sub_80B6F84
.4byte sub_80B6FA8
.align 2
gUnknown_0855C3FC:: @ 855C3FC gUnknown_0855C3FC:: @ 855C3FC
.incbin "baserom.gba", 0x55c3fc, 0x1c .4byte sub_80B7114
.4byte sub_80B7190
.4byte sub_80B71D0
.4byte sub_80B7230
.4byte sub_80B7270
.4byte sub_80B72D0
.4byte sub_80B72F4
.align 2
gUnknown_0855C418:: @ 855C418 gUnknown_0855C418:: @ 855C418
.incbin "baserom.gba", 0x55c418, 0x14 .4byte sub_80B73D0
.4byte waterfall_1_do_anim_probably
.4byte waterfall_2_wait_anim_finish_probably
.4byte sub_80B7450
.4byte sub_80B7478
.align 2
gUnknown_0855C42C:: @ 855C42C gUnknown_0855C42C:: @ 855C42C
.incbin "baserom.gba", 0x55c42c, 0xc .4byte dive_1_lock
.4byte dive_2_unknown
.4byte dive_3_unknown
.align 2
gUnknown_0855C438:: @ 855C438 gUnknown_0855C438:: @ 855C438
.incbin "baserom.gba", 0x55c438, 0x18 .4byte sub_80B764C
.4byte sub_80B7684
.4byte sub_80B76B8
.4byte sub_80B7704
.4byte sub_80B77F8
.4byte sub_80B7814
.align 2
gUnknown_0855C450:: @ 855C450 gUnknown_0855C450:: @ 855C450
.incbin "baserom.gba", 0x55c450, 0x10 .4byte sub_80B78EC
.4byte sub_80B791C
.4byte sub_80B7968
.4byte sub_80B79BC
.align 2
gUnknown_0855C460:: @ 855C460 gUnknown_0855C460:: @ 855C460
.incbin "baserom.gba", 0x55c460, 0x14 .4byte sub_80B7AE8
.4byte sub_80B7B18
.4byte sub_80B7B94
.4byte sub_80B7BCC
.4byte sub_80B7BF4
.align 2
gUnknown_0855C474:: @ 855C474 gUnknown_0855C474:: @ 855C474
.incbin "baserom.gba", 0x55c474, 0x8 .4byte sub_80B7D14
.4byte sub_80B7D34
gUnknown_0855C47C:: @ 855C47C gUnknown_0855C47C:: @ 855C47C
.incbin "baserom.gba", 0x55c47c, 0x8 .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
.align 2
gUnknown_0855C484:: @ 855C484 gUnknown_0855C484:: @ 855C484
.incbin "baserom.gba", 0x55c484, 0x8 .4byte sub_80B7EC4
.4byte sub_80B7EE8
.align 2
gUnknown_0855C48C:: @ 855C48C gUnknown_0855C48C:: @ 855C48C
.incbin "baserom.gba", 0x55c48c, 0x10 .4byte sub_80B800C
.4byte sub_80B8034
.4byte sub_80B80C4
.4byte sub_80B8198
.align 2
gUnknown_0855C49C:: @ 855C49C gUnknown_0855C49C:: @ 855C49C
.incbin "baserom.gba", 0x55c49c, 0xc .4byte sub_80B8280
.4byte sub_80B830C
.4byte sub_80B8410
.align 2
gUnknown_0855C4A8:: @ 855C4A8 gUnknown_0855C4A8:: @ 855C4A8
.incbin "baserom.gba", 0x55c4a8, 0x1c .4byte sub_80B8584
.4byte sub_80B85F8
.4byte sub_80B8660
.4byte sub_80B86EC
.4byte sub_80B871C
.4byte sub_80B8770
.4byte overworld_bg_setup_2
.align 2
gUnknown_0855C4C4:: @ 855C4C4 gUnknown_0855C4C4:: @ 855C4C4
.incbin "baserom.gba", 0x55c4c4, 0x1c .4byte sub_80B88E4
.4byte sub_80B8920
.4byte sub_80B898C
.4byte sub_80B89DC
.4byte sub_80B8A0C
.4byte sub_80B8A44
.4byte sub_80B8A64
.align 2
gUnknown_0855C4E0:: @ 855C4E0 gUnknown_0855C4E0:: @ 855C4E0
.incbin "baserom.gba", 0x55c4e0, 0x14 .4byte sub_80B8DB4
.4byte sub_80B8E14
.4byte sub_80B8E60
.4byte sub_80B8EA8
.4byte sub_80B8F24
.align 2
gUnknown_0855C4F4:: @ 855C4F4 gUnknown_0855C4F4:: @ 855C4F4
.incbin "baserom.gba", 0x55c4f4, 0x54 .4byte sub_80B9204
.4byte sub_80B925C
.4byte sub_80B92A0
.4byte sub_80B92F8
.4byte sub_80B933C
.4byte sub_80B9390
.4byte sub_80B9418
.4byte sub_80B9474
.4byte sub_80B9494
.align 2
gUnknown_0855C518:: @ 855C518
.2byte 0x0008, 0x0008, 0x00e2, 0x0000, 0x001c, 0x001c, 0x1e00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0855C530:: @ 855C530
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0xfff6, 0xfff6, 0x1600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0855C548:: @ 855C548 gUnknown_0855C548:: @ 855C548
.incbin "baserom.gba", 0x55c548, 0x8 .4byte gUnknown_0855C518
.4byte gUnknown_0855C530
.align 2
gUnknown_0855C550:: @ 855C550 gUnknown_0855C550:: @ 855C550
.incbin "baserom.gba", 0x55c550, 0x1c .4byte sub_80B9804
.4byte sub_80B98B8
.4byte sub_80B9924
.4byte sub_80B9978
.4byte sub_80B99F0
.4byte sub_80B9A28
.4byte sub_80B9A60
gUnknown_0855C56C:: @ 855C56C gUnknown_0855C56C:: @ 855C56C
.incbin "baserom.gba", 0x55c56c, 0x24 .byte 0xfe, 0xff, 0xfc, 0xff, 0xfb, 0xff, 0xfa, 0xff, 0xf9, 0xff, 0xf8, 0xff, 0xf8, 0xff, 0xf8, 0xff, 0xf9, 0xff, 0xf9, 0xff, 0xfa, 0xff, 0xfb, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0x00, 0x00, 0x02, 0x00
.byte 0x04, 0x00, 0x08, 0x00
.align 2
gUnknown_0855C590:: @ 855C590 gUnknown_0855C590:: @ 855C590
.incbin "baserom.gba", 0x55c590, 0x5c .4byte sub_80B9C28
.4byte sub_80B9C54
.4byte sub_80B9CDC
.align 2
gUnknown_0855C59C:: @ 855C59C
obj_frame_tiles gUnknown_0855C170, 0x0020
obj_frame_tiles gUnknown_0855C170 + 0x20, 0x0020
obj_frame_tiles gUnknown_0855C170 + 0x40, 0x0020
obj_frame_tiles gUnknown_0855C170 + 0x60, 0x0020
.align 2
gUnknown_0855C5BC:: @ 855C5BC
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_0855C5C4:: @ 855C5C4
.2byte 0x0001, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_0855C5CC:: @ 855C5CC
.2byte 0x0002, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_0855C5D4:: @ 855C5D4
.2byte 0x0003, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_0855C5DC:: @ 855C5DC
.4byte gUnknown_0855C5BC
.4byte gUnknown_0855C5C4
.4byte gUnknown_0855C5CC
.4byte gUnknown_0855C5D4
.align 2
gUnknown_0855C5EC:: @ 855C5EC gUnknown_0855C5EC:: @ 855C5EC
.incbin "baserom.gba", 0x55c5ec, 0x18 spr_template 0xffff, 0x111a, gOamData_855C218, gUnknown_0855C5DC, gUnknown_0855C59C, gDummySpriteAffineAnimTable, sub_80B9DB8
data/field_effect_helpers.s
+7 -4
View File
@@ -4,7 +4,7 @@
.section .rodata .section .rodata
gUnknown_085CDC38:: @ 85CDC38 gUnknown_085CDC38:: @ 85CDC38
.incbin "baserom.gba", 0x5cdc38, 0x6 .2byte 12, 28, 44
gUnknown_085CDC3E:: @ 85CDC3E gUnknown_085CDC3E:: @ 85CDC3E
.byte 0x00, 0x01, 0x02, 0x03 .byte 0x00, 0x01, 0x02, 0x03
@@ -22,8 +22,11 @@ gUnknown_085CDC54:: @ 85CDC54
.4byte sub_815550C .4byte sub_815550C
gUnknown_085CDC60:: @ 85CDC60 gUnknown_085CDC60:: @ 85CDC60
.incbin "baserom.gba", 0x5cdc60, 0xa .byte 0, 0, 1, 2, 3, 0, 0, 1, 1
.byte 0
gUnknown_085CDC6A:: @ 85CDC6A gUnknown_085CDC6A:: @ 85CDC6A
.incbin "baserom.gba", 0x5cdc6a, 0x96 .2byte 3, 7
@the following might be unref, not sure
.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00
data/field_effect_misc.s
+200 -11
View File
@@ -4,28 +4,169 @@
.section .rodata .section .rodata
.align 2 .align 2
.incbin "baserom.gba", 0x58d978, 0x2a0 gSpriteImage_858D978:: @ 858D978
.incbin "graphics/unknown/858E588/0.4bpp"
.align 2
gSpriteImage_858D9F8:: @ 858D9F8
.incbin "graphics/unknown/858E588/1.4bpp"
.align 2
gSpriteImage_858DA78:: @ 858DA78
.incbin "graphics/unknown/858E588/2.4bpp"
.align 2
gSpriteImage_858DAF8:: @ 858DAF8
.incbin "graphics/unknown/858E588/3.4bpp"
.align 2
gSpriteImage_858DB78:: @ 858DB78
.incbin "graphics/unknown/858E588/4.4bpp"
.space 32
.align 2 .align 2
gFieldEffectObjectPalette7:: @ 858DC18 gFieldEffectObjectPalette7:: @ 858DC18
.incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal" .incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal"
.incbin "baserom.gba", 0x58dc38, 0x580 .align 2
gSpriteImage_858DC38:: @ 858DC38
.incbin "graphics/unknown/858E5D8/0.4bpp"
.align 2
gSpriteImage_858DCB8:: @ 858DCB8
.incbin "graphics/unknown/858E5D8/1.4bpp"
.align 2
gSpriteImage_858DD38:: @ 858DD38
.incbin "graphics/unknown/858E5D8/2.4bpp"
.align 2
gSpriteImage_858DDB8:: @ 858DDB8
.incbin "graphics/unknown/858E5D8/3.4bpp"
.align 2
gSpriteImage_858DE38:: @ 858DE38
.incbin "graphics/unknown/858E5D8/4.4bpp"
.align 2
gSpriteImage_858DEB8:: @ 858DEB8
.incbin "graphics/unknown/858E5B0/0.4bpp"
.align 2
gSpriteImage_858DF38:: @ 858DF38
.incbin "graphics/unknown/858E5B0/1.4bpp"
.align 2
gSpriteImage_858DFB8:: @ 858DFB8
.incbin "graphics/unknown/858E5B0/2.4bpp"
.align 2
gSpriteImage_858E038:: @ 858E038
.incbin "graphics/unknown/858E5B0/3.4bpp"
.align 2
gSpriteImage_858E0B8:: @ 858E0B8
.incbin "graphics/unknown/858E5B0/4.4bpp"
.align 2
gSpriteImage_858E138:: @ 858E138
.incbin "graphics/unknown/858E5B0/5.4bpp"
.align 2 .align 2
gFieldEffectObjectPalette8:: @ 858E1B8 gFieldEffectObjectPalette8:: @ 858E1B8
.incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal" .incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal"
.incbin "baserom.gba", 0x58e1d8, 0x428 .align 2
gSpriteImage_858E1D8:: @ 858E1D8
.incbin "graphics/unknown/858E674/0.4bpp"
.align 2
gSpriteImage_858E2D8:: @ 858E2D8
.incbin "graphics/unknown/858E674/1.4bpp"
.align 2
gSpriteImage_858E3D8:: @ 858E3D8
.incbin "graphics/unknown/858E674/2.4bpp"
.align 2
gOamData_858E4D8:: @ 858E4D8
.2byte 0x0000, 0x4000, 0x0800, 0x0000
.align 2
gSpriteAnim_858E4E0:: @ 858E4E0
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858E4F8:: @ 858E4F8
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858E510:: @ 858E510
.2byte 0x0004, 0x0008, 0x0003, 0x0008, 0x0002, 0x0008, 0x0001, 0x0008, 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858E528:: @ 858E528
.2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0004, 0x0048, 0xffff, 0x0000
.align 2
gSpriteAnim_858E540:: @ 858E540
.2byte 0x0004, 0x0048, 0x0003, 0x0048, 0x0002, 0x0048, 0x0001, 0x0048, 0x0000, 0x0048, 0xffff, 0x0000
.align 2
gSpriteAnim_858E558:: @ 858E558
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnimTable_858E570:: @ 858E570
.4byte gSpriteAnim_858E4E0
.align 2
gSpriteAnimTable_858E574:: @ 858E574
.4byte gSpriteAnim_858E4F8
.4byte gSpriteAnim_858E510
.4byte gSpriteAnim_858E528
.4byte gSpriteAnim_858E540
.align 2
gSpriteAnimTable_858E584:: @ 858E584
.4byte gSpriteAnim_858E558
.align 2
gUnknown_858E588:: @ 858E588
obj_frame_tiles gSpriteImage_858D978, 0x0080
obj_frame_tiles gSpriteImage_858D9F8, 0x0080
obj_frame_tiles gSpriteImage_858DA78, 0x0080
obj_frame_tiles gSpriteImage_858DAF8, 0x0080
obj_frame_tiles gSpriteImage_858DB78, 0x0080
.align 2
gUnknown_858E5B0:: @ 858E5B0
obj_frame_tiles gSpriteImage_858DEB8, 0x0080
obj_frame_tiles gSpriteImage_858DF38, 0x0080
obj_frame_tiles gSpriteImage_858DFB8, 0x0080
obj_frame_tiles gSpriteImage_858E038, 0x0080
obj_frame_tiles gSpriteImage_858E0B8, 0x0080
.align 2
gUnknown_858E5D8:: @ 858E5D8
obj_frame_tiles gSpriteImage_858DC38, 0x0080
obj_frame_tiles gSpriteImage_858DCB8, 0x0080
obj_frame_tiles gSpriteImage_858DD38, 0x0080
obj_frame_tiles gSpriteImage_858DDB8, 0x0080
obj_frame_tiles gSpriteImage_858DE38, 0x0080
.align 2
gUnknown_0858E600:: @ 858E600 gUnknown_0858E600:: @ 858E600
.incbin "baserom.gba", 0x58e600, 0x18 spr_template 0xffff, 0x1003, gOamData_858E4D8, gSpriteAnimTable_858E570, gUnknown_858E588, gDummySpriteAffineAnimTable, sub_80FA18C
.align 2
gUnknown_0858E618:: @ 858E618 gUnknown_0858E618:: @ 858E618
.incbin "baserom.gba", 0x58e618, 0x18 spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E574, gUnknown_858E5B0, gDummySpriteAffineAnimTable, sub_80FA2D8
.align 2
gUnknown_0858E630:: @ 858E630 gUnknown_0858E630:: @ 858E630
.incbin "baserom.gba", 0x58e630, 0x18 spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E584, gUnknown_858E5D8, gDummySpriteAffineAnimTable, sub_80FA3FC
.align 2 .align 2
gFieldEffectObjectPaletteInfo7:: @ 858E648 gFieldEffectObjectPaletteInfo7:: @ 858E648
@@ -35,10 +176,27 @@ gFieldEffectObjectPaletteInfo7:: @ 858E648
gFieldEffectObjectPaletteInfo8:: @ 858E650 gFieldEffectObjectPaletteInfo8:: @ 858E650
obj_pal gFieldEffectObjectPalette8, 0x1008 obj_pal gFieldEffectObjectPalette8, 0x1008
.incbin "baserom.gba", 0x58e658, 0x34 .align 2
gOamData_858E658:: @ 858E658
.2byte 0x8000, 0x8000, 0x0800, 0x0000
.align 2
gSpriteAnim_858E660:: @ 858E660
.2byte 0x0000, 0x0006, 0x0001, 0x0006, 0x0002, 0x0006, 0xffff, 0x0000
.align 2
gSpriteAnimTable_858E670:: @ 858E670
.4byte gSpriteAnim_858E660
.align 2
gUnknown_0858E674:: @ 858E674
obj_frame_tiles gSpriteImage_858E1D8, 0x0100
obj_frame_tiles gSpriteImage_858E2D8, 0x0100
obj_frame_tiles gSpriteImage_858E3D8, 0x0100
.align 2
gUnknown_0858E68C:: @ 858E68C gUnknown_0858E68C:: @ 858E68C
.incbin "baserom.gba", 0x58e68c, 0x18 spr_template 0xffff, 0x100e, gOamData_858E658, gSpriteAnimTable_858E670, gUnknown_0858E674, gDummySpriteAffineAnimTable, door_restore_tilemap
.align 2 .align 2
@ This uses one of the secret base palettes, so there is no @ This uses one of the secret base palettes, so there is no
@@ -46,10 +204,41 @@ gUnknown_0858E68C:: @ 858E68C
gFieldEffectObjectPaletteInfo9:: @ 858E6A4 gFieldEffectObjectPaletteInfo9:: @ 858E6A4
obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E
.incbin "baserom.gba", 0x58e6ac, 0x1b8 .align 2
gSpriteImage_858E6AC:: @ 858E6AC
.incbin "graphics/unknown/858E84C/0.4bpp"
.align 2
gSpriteImage_858E72C:: @ 858E72C
.incbin "graphics/unknown/858E84C/1.4bpp"
.align 2
gSpriteImage_858E7AC:: @ 858E7AC
.incbin "graphics/unknown/858E84C/2.4bpp"
.align 2
gUnknown_0858E82C:: @ 858E82C
.incbin "graphics/unknown/unknown_58E82C.gbapal"
.align 2
gUnknown_0858E84C:: @ 858E84C
obj_frame_tiles gSpriteImage_858E6AC, 0x0080
obj_frame_tiles gSpriteImage_858E72C, 0x0080
obj_frame_tiles gSpriteImage_858E7AC, 0x0080
.align 2
gUnknown_0858E864:: @ 858E864 gUnknown_0858E864:: @ 858E864
.incbin "baserom.gba", 0x58e864, 0x1c obj_pal gUnknown_0858E82C, 0x1000
.align 2
gSpriteAnim_858E86C:: @ 858E86C
.2byte 0x0000, 0x001e, 0x0001, 0x001e, 0x0002, 0x001e, 0xfffe, 0x0000
.align 2
gSpriteAnimTable_858E87C:: @ 858E87C
.4byte gSpriteAnim_858E86C
.align 2
gUnknown_0858E880:: @ 858E880 gUnknown_0858E880:: @ 858E880
.incbin "baserom.gba", 0x58e880, 0x18 spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/field_effect_scripts.s
+1 -1
View File
@@ -256,7 +256,7 @@ gFieldEffectScript_Unknown44:: @ 82DBC45
gFieldEffectScript_Unknown45:: @ 82DBC4B gFieldEffectScript_Unknown45:: @ 82DBC4B
field_eff_loadpal gFieldEffectObjectPaletteInfo10 field_eff_loadpal gFieldEffectObjectPaletteInfo10
field_eff_callnative sub_81470D0 field_eff_callnative FldEff_Pokeball
field_eff_end field_eff_end
gFieldEffectScript_HeartIcon:: @ 82DBC56 gFieldEffectScript_HeartIcon:: @ 82DBC56
data/field_ground_effect.s
+2 -37
View File
@@ -39,7 +39,8 @@ gUnknown_0850E654:: @ 850E654
.4byte DoTracksGroundEffect_BikeTireTracks .4byte DoTracksGroundEffect_BikeTireTracks
gUnknown_0850E660:: @ 850E660 gUnknown_0850E660:: @ 850E660
.incbin "baserom.gba", 0x50e660, 0x4 .byte 13, 0
.byte 24, 0
gUnknown_0850E664:: @ 850E664 gUnknown_0850E664:: @ 850E664
.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04 .byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
@@ -65,40 +66,4 @@ gUnknown_0850E674:: @ 850E674
.4byte GroundEffect_ShortGrass .4byte GroundEffect_ShortGrass
.4byte GroundEffect_HotSprings .4byte GroundEffect_HotSprings
.4byte GroundEffect_Seaweed .4byte GroundEffect_Seaweed
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte oct_little_steps
.4byte oct_little_steps
data/field_player_avatar.s
+10 -7
View File
@@ -115,11 +115,12 @@ gUnknown_08497540:: @ 8497540
.4byte sub_808C6FC .4byte sub_808C6FC
gUnknown_08497550:: @ 8497550 gUnknown_08497550:: @ 8497550
.incbin "baserom.gba", 0x497550, 0x4 .byte 3, 4, 2, 1
gUnknown_08497554:: @ 8497554 gUnknown_08497554:: @ 8497554
.incbin "baserom.gba", 0x497554, 0x8 .byte 16, 16, 17, 18, 19
.align 2
gUnknown_0849755C:: @ 849755C gUnknown_0849755C:: @ 849755C
.4byte fish0 .4byte fish0
.4byte fish1 .4byte fish1
@@ -139,19 +140,21 @@ gUnknown_0849755C:: @ 849755C
.4byte fishF .4byte fishF
gUnknown_0849759C:: @ 849759C gUnknown_0849759C:: @ 849759C
.incbin "baserom.gba", 0x49759c, 0x6 .2byte 1, 1, 1
gUnknown_084975A2:: @ 84975A2 gUnknown_084975A2:: @ 84975A2
.incbin "baserom.gba", 0x4975a2, 0x6 .2byte 1, 3, 6
gUnknown_084975A8:: @ 84975A8 gUnknown_084975A8:: @ 84975A8
.incbin "baserom.gba", 0x4975a8, 0x2 .string "·$"
gUnknown_084975AA:: @ 84975AA gUnknown_084975AA:: @ 84975AA
.incbin "baserom.gba", 0x4975aa, 0x6 .2byte 36, 33, 30
gUnknown_084975B0:: @ 84975B0 gUnknown_084975B0:: @ 84975B0
.incbin "baserom.gba", 0x4975b0, 0xc .2byte 0, 0
.2byte 0x28, 10
.2byte 0x46, 30
gUnknown_084975BC:: @ 84975BC gUnknown_084975BC:: @ 84975BC
.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
data/field_screen.s
+352 -1571
View File
File diff suppressed because it is too large Load Diff
data/field_special_scene.s
+3 -3
View File
@@ -6,10 +6,10 @@
.align 2, 0 .align 2, 0
gTruckCamera_HorizontalTable:: @ 858E898 gTruckCamera_HorizontalTable:: @ 858E898
.incbin "baserom.gba", 0x58e898, 0x13 .byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0
gUnknown_0858E8AB:: @ 858E8AB gUnknown_0858E8AB:: @ 858E8AB
.incbin "baserom.gba", 0x58e8ab, 0x2 .byte 0x18, 0xFE
gUnknown_0858E8AD:: @ 858E8AD gUnknown_0858E8AD:: @ 858E8AD
.incbin "baserom.gba", 0x58e8ad, 0x3 .byte 0x17, 0xFE
data/field_tasks.s
+82 -6
View File
@@ -5,19 +5,95 @@
.align 2, 0 .align 2, 0
gUnknown_08510348:: @ 8510348 gUnknown_08510348:: @ 8510348
.incbin "baserom.gba", 0x510348, 0x20 .4byte nullsub_34
.4byte sub_809E3B4
.4byte sub_809DEF0
.4byte sub_809DCB4
.4byte sub_809E224
.4byte EndTruckSequence
.4byte sub_80EA3E4
.4byte sub_809E4CC
gUnknown_08510368:: @ 8510368 gUnknown_08510368:: @ 8510368
.incbin "baserom.gba", 0x510368, 0x20 .byte 0
.byte 0
.2byte 0x259
.byte 0
.byte 1
.2byte 0x261
.byte 0
.byte 0xFF
.2byte 0x259
.byte 0
.byte 0
.2byte 0x261
.byte 0
.byte 0
.2byte 0x252
.byte 1
.byte 0
.2byte 0x253
.byte 0xFF
.byte 0
.2byte 0x252
.byte 0
.byte 0
.2byte 0x253
gUnknown_08510388:: @ 8510388 gUnknown_08510388:: @ 8510388
.incbin "baserom.gba", 0x510388, 0x20 .byte 0
.byte 0
.2byte 0x25A
.byte 0
.byte 1
.2byte 0x262
.byte 0
.byte 0xFF
.2byte 0x25A
.byte 0
.byte 0
.2byte 0x262
.byte 0
.byte 0
.2byte 0x254
.byte 1
.byte 0
.2byte 0x255
.byte 0xFF
.byte 0
.2byte 0x254
.byte 0
.byte 0
.2byte 0x255
gUnknown_085103A8:: @ 85103A8 gUnknown_085103A8:: @ 85103A8
.incbin "baserom.gba", 0x5103a8, 0x20 .byte 0
.byte 0
.2byte 0x258
.byte 0
.byte 1
.2byte 0x260
.byte 0
.byte 0xFF
.2byte 0x258
.byte 0
.byte 0
.2byte 0x260
.byte 0
.byte 0
.2byte 0x250
.byte 1
.byte 0
.2byte 0x251
.byte 0xFF
.byte 0
.2byte 0x250
.byte 0
.byte 0
.2byte 0x251
gUnknown_085103C8:: @ 85103C8 gUnknown_085103C8:: @ 85103C8
.incbin "baserom.gba", 0x5103c8, 0x34 .2byte 0, 0, 0, 0, 0, 0, 0x4001, 0x4002, 0x4003, 0x4004, 0, 0, 0x4005, 0x4006, 0x4007, 0, 0, 0x4008, 0x4009, 0x400a, 0, 0, 0, 0, 0, 0
gUnknown_085103FC:: @ 85103FC gUnknown_085103FC:: @ 85103FC
.incbin "baserom.gba", 0x5103fc, 0x8 .2byte 0xE8, 0xeb, 0xea, 0xe9
data/fldeff_cut.s
+18 -6
View File
@@ -5,16 +5,28 @@
.align 2, 0 .align 2, 0
gUnknown_0857C608:: @ 857C608 gUnknown_0857C608:: @ 857C608
.incbin "baserom.gba", 0x57c608, 0x2 .byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09,
gUnknown_0857C648:: @ 857C648
.2byte 0
.2byte 0
.2byte 0x1401
.2byte 0
gUnknown_0857C60A:: @ 857C60A gUnknown_0857C650:: @ 857C650
.byte 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00 obj_image_anim_frame 0, 0x1E
.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x00, 0x00 obj_image_anim_jump 0
.byte 0x00, 0x00, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x50, 0xc6, 0x57, 0x08, 0x58, 0x6e, 0x4f, 0x08, 0x20, 0x00, 0x00, 0x00
gUnknown_0857C658:: @ 857C658
.4byte gUnknown_0857C650
gUnknown_0857C65C:: @ 857C65C
obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge + 0x520, 32
.align 2 .align 2
gFieldEffectObjectPaletteInfo6:: @ 857C664 gFieldEffectObjectPaletteInfo6:: @ 857C664
obj_pal gFieldEffectObjectPalette6, 0x1000 obj_pal gFieldEffectObjectPalette6, 0x1000
gUnknown_0857C66C:: @ 857C66C gUnknown_0857C66C:: @ 857C66C
.incbin "baserom.gba", 0x57c66c, 0x18 spr_template -1, 0x1000, gUnknown_0857C648, gUnknown_0857C658, gUnknown_0857C65C, gDummySpriteAffineAnimTable, objc_8097BA8
data/fossil_special_fldeff_groundshake.s
+75 -11
View File
@@ -3,32 +3,96 @@
.section .rodata .section .rodata
.align 2
gUnknown_08617274:: @ 8617274 gUnknown_08617274:: @ 8617274
.incbin "baserom.gba", 0x617274, 0x920 .space 0x20
.incbin "graphics/misc/mirage_tower.4bpp"
.align 2
gUnknown_08617B94:: @ 8617B94 gUnknown_08617B94:: @ 8617B94
.incbin "baserom.gba", 0x617b94, 0xb0 .incbin "graphics/misc/mirage_tower.bin"
gUnknown_08617C44:: @ 8617C44 .align 2
.incbin "baserom.gba", 0x617c44, 0x120 gRootFossil_Pal:: @ 8617C24
.incbin "graphics/misc/fossil.gbapal"
.align 2
gRootFossil_Gfx:: @ 8617C44
.incbin "graphics/misc/fossil.4bpp"
.align 2
gMirageTowerCrumbles_Gfx:: @ 8617CC4
.incbin "graphics/misc/mirage_tower_crumbles.4bpp"
.align 2
gMirageTowerCrumbles_Palette:: @ 8617D44
.incbin "graphics/misc/mirage_tower_crumbles.gbapal"
.align 1
gUnknown_08617D64:: @ 8617D64 gUnknown_08617D64:: @ 8617D64
.incbin "baserom.gba", 0x617d64, 0x30 .2byte 0x0000, 0x000a, 0x0041, 0x0011, 0x0003, 0x0032, 0xfff4, 0x0000, 0x004b, 0x000a, 0x000f, 0x005a, 0x0007, 0x0008, 0x0041, 0xffee
.2byte 0x0005, 0x004b, 0x0016, 0xfff6, 0x0037, 0xffe8, 0xfffc, 0x0041
.align 2
gUnknown_08617D94:: @ 8617D94 gUnknown_08617D94:: @ 8617D94
.incbin "baserom.gba", 0x617d94, 0x10 obj_tiles gMirageTowerCrumbles_Gfx, 0x0080, 0x0fa0
null_obj_tiles
.align 2
gUnknown_08617DA4:: @ 8617DA4 gUnknown_08617DA4:: @ 8617DA4
.incbin "baserom.gba", 0x617da4, 0x5c .byte 0x12, 0x35, 0x51, 0x02, 0x13, 0x35, 0x51, 0x02, 0x14, 0x35, 0x51, 0x02, 0x12, 0x36, 0x51, 0x02, 0x13, 0x36, 0x51, 0x02, 0x14, 0x36, 0x51, 0x02, 0x12, 0x37, 0x51, 0x02, 0x13, 0x37, 0x51, 0x02
.byte 0x14, 0x37, 0x51, 0x02, 0x12, 0x38, 0x51, 0x02, 0x13, 0x38, 0x51, 0x02, 0x14, 0x38, 0x51, 0x02, 0x12, 0x39, 0x59, 0x02, 0x13, 0x39, 0x59, 0x02, 0x14, 0x39, 0x59, 0x02, 0x12, 0x3a, 0x21, 0x01
.byte 0x13, 0x3a, 0x21, 0x01, 0x14, 0x3a, 0x21, 0x01
.align 2
gSpriteAnim_8617DEC:: @ 8617DEC
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gOamData_8617DF4:: @ 8617DF4
.2byte 0x0000, 0x4000, 0x3000, 0x0000
.align 2
gSpriteAnimTable_8617DFC:: @ 8617DFC
.4byte gSpriteAnim_8617DEC
.align 2
gUnknown_08617E00:: @ 8617E00 gUnknown_08617E00:: @ 8617E00
.incbin "baserom.gba", 0x617e00, 0x18 spr_template 0xffff, 0xffff, gOamData_8617DF4, gSpriteAnimTable_8617DFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08617E18:: @ 8617E18 gUnknown_08617E18:: @ 8617E18
.incbin "baserom.gba", 0x617e18, 0x1c .byte 0x3b, 0x43, 0x61, 0x00, 0x0f, 0x05, 0xff, 0x9b
.align 2
gSpriteAnim_8617E20:: @ 8617E20
.2byte 0x0000, 0x000c, 0xfffe, 0x0000
.align 2
gSpriteAnimTable_8617E28:: @ 8617E28
.4byte gSpriteAnim_8617E20
.align 2
gUnknown_08617E2C:: @ 8617E2C
.2byte 0x0000, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_08617E34:: @ 8617E34 gUnknown_08617E34:: @ 8617E34
.incbin "baserom.gba", 0x617e34, 0x2c spr_template 0x0fa0, 0xffff, gUnknown_08617E2C, gSpriteAnimTable_8617E28, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
.align 2
gSpriteAnim_8617E4C:: @ 8617E4C
.2byte 0x0000, 0x000c, 0xfffe, 0x0000
.align 2
gSpriteAnim_8617E54:: @ 8617E54
.4byte gSpriteAnim_8617E4C
.align 2
gOamData_8617E58:: @ 8617E58
.2byte 0x0000, 0x4000, 0x0000, 0x0000
.align 2
gUnknown_08617E60:: @ 8617E60 gUnknown_08617E60:: @ 8617E60
.incbin "baserom.gba", 0x617e60, 0x18 spr_template 0x0fa0, 0xffff, gOamData_8617E58, gSpriteAnim_8617E54, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
data/graphics.s
+31 -29
View File
@@ -4824,27 +4824,27 @@ gNamingScreenMenu_Gfx:: @ 8DD3838
.incbin "graphics/naming_screen/menu.4bpp.lz" .incbin "graphics/naming_screen/menu.4bpp.lz"
.align 2 .align 2
gNamingScreenRWindow_Gfx:: gNamingScreenRWindow_Gfx:: @ 8DD3A04
.incbin "graphics/naming_screen/rwindow.4bpp" .incbin "graphics/naming_screen/rwindow.4bpp"
.align 2 .align 2
gNamingScreenROptions_Gfx:: gNamingScreenROptions_Gfx:: @ 8DD4044
.incbin "graphics/naming_screen/roptions.4bpp" .incbin "graphics/naming_screen/roptions.4bpp"
.align 2 .align 2
gNamingScreenCursor_Gfx:: gNamingScreenCursor_Gfx:: @ 8DD4224
.incbin "graphics/naming_screen/cursor.4bpp" .incbin "graphics/naming_screen/cursor.4bpp"
.align 2 .align 2
gNamingScreenKeyboardButton_Gfx:: gNamingScreenKeyboardButton_Gfx:: @ 8DD43E4
.incbin "graphics/naming_screen/keyboard_button.4bpp" .incbin "graphics/naming_screen/keyboard_button.4bpp"
.align 2 .align 2
gNamingScreenRightPointingTriangleTiles:: gNamingScreenRightPointingTriangleTiles:: @ 8DD4504
.incbin "graphics/naming_screen/right_pointing_triangle.4bpp" .incbin "graphics/naming_screen/right_pointing_triangle.4bpp"
.align 2 .align 2
gNamingScreenUnderscoreTiles:: gNamingScreenUnderscoreTiles:: @ 8DD4524
.incbin "graphics/naming_screen/underscore.4bpp" .incbin "graphics/naming_screen/underscore.4bpp"
.align 2 .align 2
@@ -5041,48 +5041,50 @@ gUnknown_08DDD704:: @ 8DDD704
.incbin "graphics/unknown/unknown_DDD704.bin" @ textbox tilemap?? .incbin "graphics/unknown/unknown_DDD704.bin" @ textbox tilemap??
.align 2 .align 2
gUnknown_08DDD728:: @ 8DDD728 gMessageBox_Pal:: @ 8DDD728
.incbin "graphics/interface/textbox.gbapal" @ textbox palette? .incbin "graphics/text_window/message_box.gbapal"
.align 2 .align 2
gUnknown_08DDD748:: @ 8DDD748 gMessageBox_Gfx:: @ 8DDD748
.incbin "graphics/interface/textbox.4bpp" .incbin "graphics/text_window/message_box.4bpp"
.align 2 .align 2
gUnknown_08DDD908:: gWallpaperIcon_Cross::
.incbin "graphics/unknown/unknown_DDD908.bin.lz" .incbin "graphics/pokemon_storage/cross_icon.4bpp.lz"
.align 2 .align 2
gUnknown_08DDD920:: gWallpaperIcon_Bolt::
.incbin "graphics/unknown/unknown_DDD920.bin.lz" .incbin "graphics/pokemon_storage/bolt_icon.4bpp.lz"
.align 2 .align 2
gUnknown_08DDD938:: gWallpaperIcon_Plusle::
.incbin "graphics/unknown/unknown_DDD938.bin.lz" .incbin "graphics/pokemon_storage/plusle_icon.4bpp.lz"
.align 2 .align 2
gUnknown_08DDD950:: gWallpaperPalettes_Horizontal:: @ 8DDD950
.incbin "graphics/pokemon_storage/pss_window.gbapal" .incbin "graphics/pokemon_storage/friends_frame2.gbapal"
.incbin "graphics/pokemon_storage/horizontal_bg.gbapal"
.align 2 .align 2
gUnknown_08DDD990:: gWallpaperTiles_Horizontal:: @ 8DDD990
.incbin "graphics/pokemon_storage/pss_window.4bpp.lz" .incbin "graphics/pokemon_storage/horizontal.4bpp.lz"
.align 2 .align 2
gUnknown_08DDDB80:: @ 8DDDB80 gWallpaperTilemap_Horizontal:: @ 8DDDB80
.incbin "graphics/unknown/unknown_DDDB80.bin.lz" .incbin "graphics/pokemon_storage/horizontal.bin.lz"
.align 2 .align 2
gUnknown_08DDDC8C:: gWallpaperPalettes_Ribbon:: @ 8DDDC8C
.incbin "graphics/pokemon_storage/pss_window2.gbapal" .incbin "graphics/pokemon_storage/ribbon_frame.gbapal"
.incbin "graphics/pokemon_storage/ribbon_bg.gbapal"
.align 2 .align 2
gUnknown_08DDDCCC:: gWallpaperTiles_Ribbon:: @ 8DDDCCC
.incbin "graphics/pokemon_storage/pss_window2.4bpp.lz" .incbin "graphics/pokemon_storage/ribbon.4bpp.lz"
.align 2 .align 2
gUnknown_08DDDEDC:: gWallpaperTilemap_Ribbon:: @ 8DDDEDC
.incbin "graphics/pokemon_storage/pss_window2.bin.lz" .incbin "graphics/pokemon_storage/ribbon.bin.lz"
@ pokenav @ pokenav
@@ -5140,7 +5142,7 @@ gUnknown_08DE0644:: @ 8DE0644
.align 2 .align 2
gUnknown_08DE07C8:: @ 8DE07C8 gUnknown_08DE07C8:: @ 8DE07C8
.incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but this is wrong? todo, investigate? (frontier pass pal) .incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well
.align 2 .align 2
gUnknown_08DE08C8:: @ 8DE08C8 gUnknown_08DE08C8:: @ 8DE08C8
data/graphics/field_objects/field_object_graphics.inc
+15 -3
View File
@@ -5386,7 +5386,8 @@ gFieldEffectObjectPic_ShadowLarge:: @ 84F68B8
gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938 gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938
.incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp" .incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp"
.incbin "baserom.gba", 0x4f6d38, 0x160 gUnknown_084F6D38:: @ 84F6D38
.incbin "graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp"
.align 2 .align 2
gFieldEffectObjectPalette6:: @ 84F6E98 gFieldEffectObjectPalette6:: @ 84F6E98
@@ -5500,7 +5501,17 @@ gFieldEffectObjectPic_BikeHopTallGrass_2:: @ 84F7938
gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978 gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978
.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp" .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp"
.incbin "baserom.gba", 0x4f79b8, 0x200 gUnusedGrass_0:: @4F79B8
.incbin "graphics/map_objects/pics/effects/unused_grass/0.4bpp"
gUnusedGrass_1:: @4F7A38
.incbin "graphics/map_objects/pics/effects/unused_grass/1.4bpp"
gUnusedGrass_2:: @4F7AB8
.incbin "graphics/map_objects/pics/effects/unused_grass/2.4bpp"
gUnusedGrass_3:: @4F7B38
.incbin "graphics/map_objects/pics/effects/unused_grass/3.4bpp"
.align 2 .align 2
gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8 gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8
@@ -5522,7 +5533,8 @@ gFieldEffectObjectPic_Unknown16_3:: @ 84F7D38
gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8 gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8
.incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp" .incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp"
.incbin "baserom.gba", 0x4f7e38, 0x80 gUnknown_084F7E38:: @ 84F7E38
.incbin "graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp"
.align 2 .align 2
gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8 gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8
data/graphics/pokemon/graphics.inc
+7 -1
View File
@@ -9250,7 +9250,13 @@ gMonShinyPalette_Deoxys:: @ 8D3B7D0
gMonIcon_Deoxys:: @ 8D3B7F8 gMonIcon_Deoxys:: @ 8D3B7F8
.incbin "graphics/pokemon/icons/deoxys_icon.4bpp" .incbin "graphics/pokemon/icons/deoxys_icon.4bpp"
.incbin "baserom.gba", 0xd3bbf8, 0x8000 .incbin "graphics/pokemon/icons/deoxys_speed_icon.4bpp"
.incbin "graphics/unused/deoxys_speed_icon_wide.4bpp"
.space 0x6800
.incbin "graphics/unknown/unknown_D437F8.bin"
.align 2 .align 2
gMonFootprint_Deoxys:: @ 8D43BF8 gMonFootprint_Deoxys:: @ 8D43BF8
data/item_icon.s
+13 -3
View File
@@ -6,8 +6,18 @@
@ 8614410 @ 8614410
.include "data/graphics/items/item_icon_table.inc" .include "data/graphics/items/item_icon_table.inc"
@ 8614FE0 gUnknown_08614FE0:: @ 8614FE0
.incbin "baserom.gba", 0x614fe0, 0x14 .2byte 0
.2byte 0x8000
.2byte 0x2400
.2byte 0
gUnknown_08614FE8:: @ 8614FE8
obj_image_anim_frame 0, 0
obj_image_anim_end
gUnknown_08614FF0:: @ 8614FF0
.4byte gUnknown_08614FE8
gUnknown_08614FF4:: @ 8614FF4 gUnknown_08614FF4:: @ 8614FF4
.incbin "baserom.gba", 0x614ff4, 0x18 spr_template 0, 0, gUnknown_08614FE0, gUnknown_08614FF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/item_menu.s
+19 -4
View File
@@ -100,13 +100,28 @@ gUnknown_08614094:: @ 8614094
.4byte 0x6F .4byte 0x6F
gUnknown_086140A4:: @ 86140A4 gUnknown_086140A4:: @ 86140A4
.incbin "baserom.gba", 0x6140a4, 0xc0 .incbin "graphics/interface/select_button.4bpp"
gUnknown_08614164:: @ 8614164 gUnknown_08614164:: @ 8614164
.incbin "baserom.gba", 0x614164, 0x10 .byte 0, 1, 3, 0, 1, 4, 0, 3, 6, 2, 1, 3, 0, 14, 10, 0
gUnknown_08614174:: @ 8614174 gUnknown_08614174:: @ 8614174
.incbin "baserom.gba", 0x614174, 0x38 window_template 0, 14, 2, 15, 16, 1, 0x27
window_template 0, 0, 13, 14, 6, 1, 0x117
window_template 0, 4, 1, 8, 2, 1, 0x1A1
window_template 0, 1, 13, 5, 6, 12, 0x16B
window_template 0, 7, 13, 4, 6, 12, 0x189
window_template 1, 2, 15, 27, 4, 15, 0x1B1
null_window_template
gUnknown_086141AC:: @ 86141AC gUnknown_086141AC:: @ 86141AC
.incbin "baserom.gba", 0x6141ac, 0x50 window_template 1, 22, 17, 7, 2, 15, 0x21D
window_template 1, 22, 15, 7, 4, 15, 0x21D
window_template 1, 15, 15, 14, 4, 15, 0x21D
window_template 1, 15, 13, 14, 6, 15, 0x21D
window_template 1, 2, 15, 27, 4, 15, 0x1B1
window_template 1, 24, 15, 5, 4, 15, 0x21D
window_template 1, 21, 9, 5, 4, 15, 0x21D
window_template 1, 24, 17, 5, 2, 15, 0x21D
window_template 1, 18, 11, 10, 2, 15, 0x245
window_template 1, 1, 1, 10, 2, 15, 0x231
data/item_menu_icons.s
+173 -27
View File
@@ -1,75 +1,221 @@
#include "constants/items.h" #include "constants/items.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0
gUnknown_0857F464:: @ 857F464 .align 2
.incbin "baserom.gba", 0x57f464, 0xe0 gUnknown_0857F564:: @ 857F564
.incbin "graphics/interface/bag_spinner.gbapal"
gUnknown_0857F544:: @ 857F544 .align 2
.incbin "baserom.gba", 0x57f544, 0x5f0 gUnknown_0857F584:: @ 857F584
.incbin "graphics/interface/bag_spinner.4bpp"
.align 2
gUnknown_0857F604:: @ 857F604
.incbin "graphics/unused/cherry.4bpp"
.align 2
gUnknown_0857FA84:: @ 857FA84
.incbin "graphics/unused/cherry.gbapal"
.align 2
gOamData_857FAA4:: @ 857FAA4
.2byte 0x0100, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_857FAAC:: @ 857FAAC
.2byte 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAB4:: @ 857FAB4
.2byte 0x0040, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FABC:: @ 857FABC
.2byte 0x0080, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAC4:: @ 857FAC4
.2byte 0x00c0, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FACC:: @ 857FACC
.2byte 0x0100, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAD4:: @ 857FAD4
.2byte 0x0140, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FADC:: @ 857FADC
.4byte gSpriteAnim_857FAAC
.4byte gSpriteAnim_857FAB4
.4byte gSpriteAnim_857FAC4
.4byte gSpriteAnim_857FACC
.4byte gSpriteAnim_857FAD4
.4byte gSpriteAnim_857FABC
.align 2
gSpriteAffineAnim_857FAF4:: @ 857FAF4
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FB04:: @ 857FB04
.2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_857FB2C:: @ 857FB2C
.4byte gSpriteAffineAnim_857FAF4
.4byte gSpriteAffineAnim_857FB04
.align 2
gUnknown_0857FB34:: @ 857FB34 gUnknown_0857FB34:: @ 857FB34
.incbin "baserom.gba", 0x57fb34, 0x8 obj_tiles gBagMaleTiles, 0x3000, 0x0064
.align 2
gUnknown_0857FB3C:: @ 857FB3C gUnknown_0857FB3C:: @ 857FB3C
.incbin "baserom.gba", 0x57fb3c, 0x8 obj_tiles gBagFemaleTiles, 0x3000, 0x0064
.align 2
gUnknown_0857FB44:: @ 857FB44 gUnknown_0857FB44:: @ 857FB44
.incbin "baserom.gba", 0x57fb44, 0x8 obj_pal gBagPalette, 0x0064
.align 2
gUnknown_0857FB4C:: @ 857FB4C gUnknown_0857FB4C:: @ 857FB4C
.incbin "baserom.gba", 0x57fb4c, 0x4c spr_template 0x0064, 0x0064, gOamData_857FAA4, gSpriteAnimTable_857FADC, NULL, gSpriteAffineAnimTable_857FB2C, SpriteCallbackDummy
.align 2
gOamData_857FB64:: @ 857FB64
.2byte 0x0000, 0x4800, 0x0800, 0x0000
.align 2
gSpriteAnim_857FB6C:: @ 857FB6C
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FB74:: @ 857FB74
.4byte gSpriteAnim_857FB6C
.align 2
gSpriteAffineAnim_857FB78:: @ 857FB78
.2byte 0x0000, 0x0000, 0x1008, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FB88:: @ 857FB88
.2byte 0x0000, 0x0000, 0x10f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0857FB98:: @ 857FB98 gUnknown_0857FB98:: @ 857FB98
.incbin "baserom.gba", 0x57fb98, 0x4 .4byte gSpriteAffineAnim_857FB78
.align 2
gUnknown_0857FB9C:: @ 857FB9C gUnknown_0857FB9C:: @ 857FB9C
.incbin "baserom.gba", 0x57fb9c, 0x4 .4byte gSpriteAffineAnim_857FB88
.align 2
gUnknown_0857FBA0:: @ 857FBA0 gUnknown_0857FBA0:: @ 857FBA0
.incbin "baserom.gba", 0x57fba0, 0x8 obj_tiles gUnknown_0857F584, 0x0080, 0x0065
.align 2
gUnknown_0857FBA8:: @ 857FBA8 gUnknown_0857FBA8:: @ 857FBA8
.incbin "baserom.gba", 0x57fba8, 0x8 obj_pal gUnknown_0857F564, 0x0065
.align 2
gUnknown_0857FBB0:: @ 857FBB0 gUnknown_0857FBB0:: @ 857FBB0
.incbin "baserom.gba", 0x57fbb0, 0x3c spr_template 0x0065, 0x0065, gOamData_857FB64, gSpriteAnimTable_857FB74, NULL, gUnknown_0857FB98, ObjectCB_SwitchPocketRotatingBallInit
.align 2
gOamData_857FBC8:: @ 857FBC8
.2byte 0x0000, 0xc000, 0x7400, 0x0000
.align 2
gOamData_857FBD0:: @ 857FBD0
.2byte 0x0300, 0xc000, 0x7000, 0x0000
.align 2
gSpriteAnim_857FBD8:: @ 857FBD8
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FBE0:: @ 857FBE0
.4byte gSpriteAnim_857FBD8
.align 2
gOamData_857FBE4:: @ 857FBE4
.2byte 0xc000, 0x0201, 0x0800, 0x0000
.align 2
gUnknown_0857FBEC:: @ 857FBEC gUnknown_0857FBEC:: @ 857FBEC
.incbin "baserom.gba", 0x57fbec, 0x90 spr_template 0xffff, 0x7544, gOamData_857FBC8, gSpriteAnimTable_857FBE0, gOamData_857FBE4, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSpriteAffineAnim_857FC04:: @ 857FC04
.2byte 0xffff, 0xffff, 0x60fd, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0xfffe, 0xfffe, 0x40ff, 0x0000, 0xfff8, 0x0000, 0x1000, 0x0000
.2byte 0x0000, 0xfff8, 0x1000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FC3C:: @ 857FC3C
.2byte 0xffff, 0xffff, 0x6003, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0xfffe, 0xfffe, 0x4001, 0x0000, 0xfff8, 0x0000, 0x1000, 0x0000
.2byte 0x0000, 0xfff8, 0x1000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_857FC74:: @ 857FC74
.4byte gSpriteAffineAnim_857FC04
.4byte gSpriteAffineAnim_857FC3C
.align 2
gUnknown_0857FC7C:: @ 857FC7C gUnknown_0857FC7C:: @ 857FC7C
.incbin "baserom.gba", 0x57fc7c, 0x18 spr_template 0xffff, 0x7544, gOamData_857FBD0, gSpriteAnimTable_857FBE0, gOamData_857FBE4, gSpriteAffineAnimTable_857FC74, SpriteCallbackDummy
@ 857FC94 @ 857FC94
.include "data/graphics/berries/berry_pic_table.inc" .include "data/graphics/berries/berry_pic_table.inc"
.align 2
gUnknown_0857FDEC:: @ 857FDEC gUnknown_0857FDEC:: @ 857FDEC
.incbin "baserom.gba", 0x57fdec, 0x8 obj_tiles gBerryCheckCircle_Gfx, 0x0800, 0x2710
.align 2
gUnknown_0857FDF4:: @ 857FDF4 gUnknown_0857FDF4:: @ 857FDF4
.incbin "baserom.gba", 0x57fdf4, 0x1c obj_pal gUnknown_08D9BEF0, 0x2710
.align 2
gOamData_857FDFC:: @ 857FDFC
.2byte 0x0000, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_857FE04:: @ 857FE04
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FE0C:: @ 857FE0C
.4byte gSpriteAnim_857FE04
.align 2
gUnknown_0857FE10:: @ 857FE10 gUnknown_0857FE10:: @ 857FE10
.incbin "baserom.gba", 0x57fe10, 0x18 spr_template 0x2710, 0x2710, gOamData_857FDFC, gSpriteAnimTable_857FE0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0857FE28:: @ 857FE28 gUnknown_0857FE28:: @ 857FE28
.incbin "baserom.gba", 0x57fe28, 0x18 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5860
.align 2
gUnknown_0857FE40:: @ 857FE40 gUnknown_0857FE40:: @ 857FE40
.incbin "baserom.gba", 0x57fe40, 0x18 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58F8
.align 2
gUnknown_0857FE58:: @ 857FE58 gUnknown_0857FE58:: @ 857FE58
.incbin "baserom.gba", 0x57fe58, 0x18 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5968
.align 2
gUnknown_0857FE70:: @ 857FE70 gUnknown_0857FE70:: @ 857FE70
.incbin "baserom.gba", 0x57fe70, 0x18 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5A94
.align 2
gUnknown_0857FE88:: @ 857FE88 gUnknown_0857FE88:: @ 857FE88
.incbin "baserom.gba", 0x57fe88, 0x18 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5B48
@ 857FEA0 @ 857FEA0
.include "data/text/item_descriptions.inc" .include "data/text/item_descriptions.inc"
data/learn_move.s
+76 -7
View File
@@ -2,23 +2,92 @@
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
gUnknown_085CE9F8:: @ 85CE9F8
.incbin "graphics/interface/ui_learn_move.gbapal"
gUnknown_085CEA18:: @ 85CEA18 gUnknown_085CEA18:: @ 85CEA18
.incbin "baserom.gba", 0x5ceA18, 0x198 .incbin "graphics/interface/ui_learn_move.4bpp"
gUnknown_085CEB98:: @ 85CEB98
.2byte 0
.2byte 0
.2byte 0
.2byte 0
.2byte 0x8000
.2byte 0
.2byte 0
.2byte 0
.2byte 0x4000
.2byte 0
.2byte 0
.2byte 0
gUnknown_085CEBB0:: @ 85CEBB0 gUnknown_085CEBB0:: @ 85CEBB0
.incbin "baserom.gba", 0x5cebb0, 0x8 obj_tiles gUnknown_085CEA18, 0x180, 0x1595
gUnknown_085CEBB8:: @ 85CEBB8 gUnknown_085CEBB8:: @ 85CEBB8
.incbin "baserom.gba", 0x5cebb8, 0x8 obj_pal gUnknown_085CE9F8, 0x1596
gUnknown_085CEBC0:: @ 85CEBC0 gUnknown_085CEBC0:: @ 85CEBC0
.incbin "baserom.gba", 0x5cebc0, 0x10 .byte 0
.byte 0x1B
.byte 16
.byte 1
.byte 0x75
.byte 16
.2byte 0xFFFF
.2byte 0xFFFF
.2byte 0x14CD
.2byte 0x14CD
.byte 0, 0
gUnknown_085CEBD0:: @ 85CEBD0 gUnknown_085CEBD0:: @ 85CEBD0
.incbin "baserom.gba", 0x5cebd0, 0x40 .byte 2
.byte 0xC0
.byte 8
.byte 3
.byte 0xC0
.byte 0x68
.2byte 0
.2byte 0
.2byte 0x1531
.2byte 0x1531
.byte 0, 0
gUnknown_085CEBE0:: @ 85CEBE0
.2byte 8
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEBE8:: @ 85CEBE8
.2byte 9
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEBF0:: @ 85CEBF0
.2byte 10
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEBF8:: @ 85CEBF8
.2byte 11
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEC00:: @ 85CEC00
.4byte gUnknown_085CEBE0
.4byte gUnknown_085CEBE8
.4byte gUnknown_085CEBF0
.4byte gUnknown_085CEBF8
gUnknown_085CEC10:: @ 85CEC10 gUnknown_085CEC10:: @ 85CEC10
.incbin "baserom.gba", 0x5cec10, 0x18 spr_template 0x1595, 0x1596, gUnknown_085CEB98, gUnknown_085CEC00, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085CEC28:: @ 85CEC28 gUnknown_085CEC28:: @ 85CEC28
.incbin "baserom.gba", 0x5cec28, 0x8 .4byte 0x1F0
.4byte 0x11E1

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