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

label and document battle windows

Browse Source
This commit is contained in:
DizzyEggg
2018-06-17 16:48:58 +02:00
parent f807eb1f2d
commit caa36b530a
55 changed files with 1361 additions and 845 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_2.s
+8 -8
View File
@@ -20646,29 +20646,29 @@ _081A5328:
ldr r4, =gDisplayedStringBattle
adds r0, r4, 0
movs r1, 0xF
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Vs
movs r1, 0x10
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_OpponentMon1Name
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x11
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Mind
movs r1, 0x12
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Skill
movs r1, 0x13
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Body
movs r1, 0x14
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldr r0, =gText_Judgement
bl BattleStringExpandPlaceholdersToDisplayedString
adds r0, r4, 0
movs r1, 0x15
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
b _081A553E
.pool
_081A53B4:
@@ -20752,7 +20752,7 @@ _081A5464:
bl BattleStringExpandPlaceholdersToDisplayedString
ldr r0, =gDisplayedStringBattle
movs r1, 0x15
bl BattleHandleAddTextPrinter
bl BattlePutTextOnWindow
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
asm/easy_chat.s
+1 -1
View File
@@ -5988,7 +5988,7 @@ sub_811D0BC: @ 811D0BC
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadSav2WindowGfx
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE
asm/party_menu.s
+1 -1
View File
@@ -4396,7 +4396,7 @@ _081B23E8:
movs r0, 0
movs r1, 0x4F
movs r2, 0xD0
bl sub_809882C
bl LoadSav2WindowGfx
bl GetOverworldTextboxPalettePtr
movs r1, 0xE0
movs r2, 0x20
asm/pokemon_storage_system.s
+2 -2
View File
@@ -1837,7 +1837,7 @@ _080C805E:
movs r0, 0x1
movs r1, 0xB
movs r2, 0xE0
bl sub_809882C
bl LoadSav2WindowGfx
b _080C8198
.pool
_080C808C:
@@ -6712,7 +6712,7 @@ sub_80CAC1C: @ 80CAC1C
movs r0, 0x1
movs r1, 0x2
movs r2, 0xD0
bl sub_809882C
bl LoadSav2WindowGfx
movs r0, 0x20
str r0, [sp]
movs r0, 0x14
asm/pokemon_summary_screen.s
+2 -2
View File
@@ -5293,11 +5293,11 @@ sub_81C6BD8: @ 81C6BD8
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadSav2WindowGfx
movs r0, 0
movs r1, 0xA
movs r2, 0xD0
bl copy_textbox_border_tile_patterns_to_vram
bl LoadMessageBoxGfx
ldr r0, =gUnknown_0860F074
movs r1, 0xF0
movs r2, 0x20
asm/pokenav.s
+3 -3
View File
@@ -10101,7 +10101,7 @@ sub_81CC09C: @ 81CC09C
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x40
bl sub_809882C
bl LoadSav2WindowGfx
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x4
@@ -11351,7 +11351,7 @@ sub_81CCA1C: @ 81CCA1C
lsrs r0, 24
movs r1, 0x42
movs r2, 0x40
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
ldrb r0, [r5, 0x8]
movs r1, 0x42
movs r2, 0x4
@@ -22282,7 +22282,7 @@ sub_81D2824: @ 81D2824
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadSav2WindowGfx
ldr r0, =gUnknown_0860F074
movs r1, 0xF0
movs r2, 0x20
asm/rom_8011DC0.s
+12 -12
View File
@@ -10972,11 +10972,11 @@ _08018574:
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
bl sub_809882C
bl LoadSav2WindowGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xF0
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
movs r4, 0x20
str r4, [sp]
str r4, [sp, 0x4]
@@ -15907,11 +15907,11 @@ _0801AD8C:
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadSav2WindowGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
bl sub_819789C
ldr r0, =sub_801AC40
bl SetVBlankCallback
@@ -27081,11 +27081,11 @@ sub_8020740: @ 8020740
movs r0, 0x3
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadSav2WindowGfx
movs r0, 0x3
movs r1, 0xA
movs r2, 0x20
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
ldr r0, =gUnknown_0860F074
movs r1, 0xE0
movs r2, 0x20
@@ -30171,7 +30171,7 @@ _0802210C:
ldr r4, =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
ldrb r0, [r5]
movs r1, 0
adds r2, r4, 0
@@ -30370,7 +30370,7 @@ _08022296:
ldr r4, =0x0000021d
adds r1, r4, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
ldrb r0, [r6, 0x2]
movs r1, 0
adds r2, r4, 0
@@ -35221,7 +35221,7 @@ sub_80248B0: @ 80248B0
ldr r5, =0x0000021d
adds r1, r5, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
ldrb r4, [r4]
bl sub_80247BC
adds r3, r0, 0
@@ -41645,7 +41645,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD
@@ -44214,7 +44214,7 @@ sub_802902C: @ 802902C
movs r0, 0
movs r1, 0xA
movs r2, 0xB0
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
pop {r0}
bx r0
thumb_func_end sub_802902C
@@ -54638,7 +54638,7 @@ sub_802E500: @ 802E500
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD0
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD
asm/shop.s
+2 -2
View File
@@ -1157,11 +1157,11 @@ BuyMenuInitWindows: @ 80E0468
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_809882C
bl LoadSav2WindowGfx
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
bl copy_textbox_border_tile_patterns_to_vram
bl LoadMessageBoxGfx
movs r0, 0
bl PutWindowTilemap
movs r0, 0x1
asm/slot_machine.s
+2 -2
View File
@@ -634,12 +634,12 @@ sub_812AA48: @ 812AA48
lsls r1, 2
movs r0, 0
movs r2, 0xF0
bl copy_textbox_border_tile_patterns_to_vram
bl LoadMessageBoxGfx
movs r1, 0x85
lsls r1, 2
movs r0, 0
movs r2, 0xE0
bl sub_809882C
bl LoadSav2WindowGfx
movs r0, 0
bl PutWindowTilemap
pop {r0}
asm/trade.s
+2 -2
View File
@@ -241,11 +241,11 @@ _08077310:
movs r0, 0
movs r1, 0x14
movs r2, 0xC0
bl box_border_load_tiles_and_pal
bl LoadSav2WindowGfx_
movs r0, 0x2
movs r1, 0x1
movs r2, 0xE0
bl sub_809882C
bl LoadSav2WindowGfx
bl LoadMonIconPalettes
ldr r2, =gUnknown_0203229C
ldr r0, [r2]