summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/easy_chat.s2
-rw-r--r--asm/field_specials.s4
-rw-r--r--asm/learn_move.s2
-rw-r--r--asm/link_rfu.s2
-rw-r--r--asm/macros/map.inc29
-rw-r--r--asm/party_menu.s2
-rw-r--r--asm/pokemon_storage_system.s4
-rw-r--r--asm/pokemon_summary_screen.s6
-rw-r--r--asm/pokenav.s8
-rw-r--r--asm/rom_8011DC0.s52
-rw-r--r--asm/shop.s4
-rw-r--r--asm/slot_machine.s2
-rw-r--r--asm/trade.s4
13 files changed, 69 insertions, 52 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index a6b522a7e..1d8753fa0 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -5988,7 +5988,7 @@ sub_811D0BC: @ 811D0BC
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE0
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE
diff --git a/asm/field_specials.s b/asm/field_specials.s
index 3db508001..75aa161e5 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -912,7 +912,7 @@ _0813839C:
adds r0, r5, 0
adds r2, r4, 0
mov r3, r12
- bl SpawnSpecialEventObjectParametrized
+ bl SpawnSpecialEventObjectParameterized
adds r0, r5, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -2557,7 +2557,7 @@ SpawnScriptEventObject: @ 8139158
movs r0, 0x7
movs r1, 0x8
movs r2, 0x7F
- bl SpawnSpecialEventObjectParametrized
+ bl SpawnSpecialEventObjectParameterized
lsls r0, 24
lsrs r0, 24
ldr r2, =gEventObjects
diff --git a/asm/learn_move.s b/asm/learn_move.s
index a33bd11b6..109f1a32e 100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -1270,7 +1270,7 @@ _081611D4:
ldrb r0, [r0]
cmp r0, 0xFF
bne _08161210
- ldr r0, =gUnknown_0203CE8C
+ ldr r0, =gTempScrollArrowTemplate
adds r2, r0, 0
ldr r1, =gUnknown_085CEBD0
ldm r1!, {r3,r5,r6}
diff --git a/asm/link_rfu.s b/asm/link_rfu.s
index e53685c28..1179b9866 100644
--- a/asm/link_rfu.s
+++ b/asm/link_rfu.s
@@ -856,7 +856,7 @@ sub_8011AFC: @ 8011AFC
bl ResetPaletteFade
ldr r0, =sub_8011AE8
bl SetVBlankCallback
- bl sub_80093CC
+ bl IsWirelessAdapterConnected
lsls r0, 24
cmp r0, 0
beq _08011B70
diff --git a/asm/macros/map.inc b/asm/macros/map.inc
index 69b3629f6..23806b4cc 100644
--- a/asm/macros/map.inc
+++ b/asm/macros/map.inc
@@ -34,18 +34,27 @@
inc _num_warps
.endm
- .macro coord_event x, y, byte1, byte2, word1, word2, word3, script
+ .macro coord_event x, y, elevation, trigger, index, script
.2byte \x, \y
- .byte \byte1, \byte2
- .2byte \word1, \word2, \word3
+ .byte \elevation, 0
+ .2byte \trigger, \index, 0
.4byte \script
inc _num_traps
.endm
- .macro bg_event x, y, byte, kind, word, arg6, arg7, arg8
+ .macro coord_weather_event x, y, elevation, weather
.2byte \x, \y
- .byte \byte, \kind
- .2byte \word
+ .byte \elevation, 0
+ .2byte \weather
+ .2byte 0, 0
+ .4byte 0
+ inc _num_traps
+ .endm
+
+ .macro bg_event x, y, elevation, kind, arg6, arg7, arg8
+ .2byte \x, \y
+ .byte \elevation, \kind
+ .2byte 0
.if \kind < 5
.4byte \arg6
.else
@@ -55,6 +64,14 @@
inc _num_signs
.endm
+ .macro bg_hidden_item_event x, y, height, item, flag
+ bg_event \x, \y, \height, 7, \item, \flag, 0
+ .endm
+
+ .macro bg_secret_base_event x, y, height, secret_base_id
+ bg_event \x, \y, \height, 8, \secret_base_id, 0, 0
+ .endm
+
.macro map_events npcs, warps, traps, signs
.byte _num_npcs, _num_warps, _num_traps, _num_signs
.4byte \npcs, \warps, \traps, \signs
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 017f1dc54..110c5e627 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -4396,7 +4396,7 @@ _081B23E8:
movs r0, 0
movs r1, 0x4F
movs r2, 0xD0
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
bl GetOverworldTextboxPalettePtr
movs r1, 0xE0
movs r2, 0x20
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index f2b9a5563..b02f3e58a 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -1837,7 +1837,7 @@ _080C805E:
movs r0, 0x1
movs r1, 0xB
movs r2, 0xE0
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
b _080C8198
.pool
_080C808C:
@@ -6712,7 +6712,7 @@ sub_80CAC1C: @ 80CAC1C
movs r0, 0x1
movs r1, 0x2
movs r2, 0xD0
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
movs r0, 0x20
str r0, [sp]
movs r0, 0x14
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 3d184e86f..988aaf41e 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -2869,7 +2869,7 @@ sub_81C5674: @ 81C5674
movs r1, 0xAC
movs r2, 0xC
movs r3, 0x94
- bl AddScrollIndicatorArrowPairParametrized
+ bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r4]
ldr r2, =0x00000816
adds r1, r2
@@ -4868,7 +4868,7 @@ sub_81C67CC: @ 81C67CC
ldrb r0, [r5]
movs r1, 0x10
movs r2, 0x1
- bl sub_81AF15C
+ bl ListMenuSetUnkIndicatorsStructField
ldr r0, =gSaveBlock2Ptr
ldr r3, [r0]
movs r0, 0x2
@@ -5293,7 +5293,7 @@ sub_81C6BD8: @ 81C6BD8
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0xA
movs r2, 0xD0
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 1e4cac5d7..1ad4354a2 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -10101,7 +10101,7 @@ sub_81CC09C: @ 81CC09C
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x40
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
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 LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
ldrb r0, [r5, 0x8]
movs r1, 0x42
movs r2, 0x4
@@ -21001,7 +21001,7 @@ sub_81D1E90: @ 81D1E90
movs r1, 0xC8
movs r2, 0xC
movs r3, 0x94
- bl AddScrollIndicatorArrowPairParametrized
+ bl AddScrollIndicatorArrowPairParameterized
strb r0, [r4, 0x9]
add sp, 0x10
pop {r4}
@@ -22282,7 +22282,7 @@ sub_81D2824: @ 81D2824
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
ldr r0, =gUnknown_0860F074
movs r1, 0xF0
movs r2, 0x20
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s
index b43978f84..dc4412f59 100644
--- a/asm/rom_8011DC0.s
+++ b/asm/rom_8011DC0.s
@@ -679,7 +679,7 @@ _08012B3C:
bl sub_8013398
strb r0, [r6, 0x13]
ldrb r0, [r6, 0x12]
- bl sub_81AE70C
+ bl RedrawListMenu
b _08012E5C
.pool
_08012B54:
@@ -837,7 +837,7 @@ _08012C5C:
movs r0, 0
strb r0, [r1, 0x1B]
ldrb r0, [r6, 0x12]
- bl sub_81AE70C
+ bl RedrawListMenu
ldrb r0, [r6, 0x13]
adds r0, 0x1
strb r0, [r6, 0x13]
@@ -908,7 +908,7 @@ _08012D04:
ldr r0, [r6]
bl sub_8013398
ldrb r0, [r6, 0x12]
- bl sub_81AE70C
+ bl RedrawListMenu
_08012D40:
movs r0, 0x4
strb r0, [r6, 0xC]
@@ -1459,7 +1459,7 @@ _08013228:
movs r0, 0x2
bl PlaySE
ldrb r0, [r4, 0x12]
- bl sub_81AE70C
+ bl RedrawListMenu
ldr r0, =gStringVar2
ldrb r2, [r4, 0x13]
lsls r2, 5
@@ -1478,7 +1478,7 @@ _0801325C:
movs r1, 0
bl sub_8011A64
ldrb r0, [r4, 0x12]
- bl sub_81AE70C
+ bl RedrawListMenu
strb r5, [r4, 0xC]
movs r0, 0x1
b _08013272
@@ -2373,7 +2373,7 @@ _08013A70:
strb r0, [r6, 0x8]
_08013A72:
ldrb r0, [r6, 0xE]
- bl sub_81AE70C
+ bl RedrawListMenu
b _08013B82
_08013A7A:
bl sub_8011A74
@@ -2542,7 +2542,7 @@ sub_8013BD8: @ 8013BD8
movs r1, 0
bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r4, 0xE]
- bl sub_81AE70C
+ bl RedrawListMenu
ldr r0, =gStringVar1
ldrb r2, [r4, 0xF]
lsls r2, 5
@@ -4281,7 +4281,7 @@ _08014C34:
bl sub_8013398
strb r0, [r5, 0x13]
ldrb r0, [r5, 0x12]
- bl sub_81AE70C
+ bl RedrawListMenu
_08014C42:
movs r0, 0x2
strb r0, [r5, 0xC]
@@ -4326,7 +4326,7 @@ _08014C82:
adds r1, r0
strb r4, [r1, 0x1B]
ldrb r0, [r5, 0x12]
- bl sub_81AE70C
+ bl RedrawListMenu
movs r0, 0x5
strb r0, [r5, 0x19]
ldrb r1, [r5, 0x13]
@@ -4396,7 +4396,7 @@ _08014CF2:
movs r0, 0
strb r0, [r1, 0x1B]
ldrb r0, [r5, 0x12]
- bl sub_81AE70C
+ bl RedrawListMenu
ldrb r0, [r5, 0x13]
adds r0, 0x1
strb r0, [r5, 0x13]
@@ -4441,7 +4441,7 @@ _08014D64:
ldr r0, [r5]
bl sub_8013398
ldrb r0, [r5, 0x12]
- bl sub_81AE70C
+ bl RedrawListMenu
movs r0, 0x2
strb r0, [r5, 0xC]
_08014DA4:
@@ -4784,7 +4784,7 @@ _080150B8:
bl PlaySE
_080150CE:
ldrb r0, [r7, 0xE]
- bl sub_81AE70C
+ bl RedrawListMenu
b _080152A0
_080150D6:
ldrb r0, [r7, 0xE]
@@ -4818,7 +4818,7 @@ _080150D6:
movs r1, 0
bl CreateWirelessStatusIndicatorSprite
ldrb r0, [r7, 0xE]
- bl sub_81AE70C
+ bl RedrawListMenu
ldr r0, =gStringVar1
ldrb r2, [r7, 0xF]
lsls r2, 5
@@ -5152,7 +5152,7 @@ _08015436:
b _08015604
_0801543E:
ldrb r0, [r5, 0xE]
- bl sub_81AE70C
+ bl RedrawListMenu
b _08015604
_08015446:
ldrb r0, [r5, 0x13]
@@ -10972,11 +10972,11 @@ _08018574:
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xF0
- bl LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
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 LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
- bl LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
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 LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
movs r0, 0x3
movs r1, 0xA
movs r2, 0x20
- bl LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
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 LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
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 LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
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 LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
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 LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
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 LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
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 LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD
diff --git a/asm/shop.s b/asm/shop.s
index 515174151..1412fef22 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -877,7 +877,7 @@ BuyMenuAddScrollIndicatorArrows: @ 80E01C8
movs r1, 0xAC
movs r2, 0xC
movs r3, 0x94
- bl AddScrollIndicatorArrowPairParametrized
+ bl AddScrollIndicatorArrowPairParameterized
ldr r1, [r5]
adds r1, r4
strb r0, [r1]
@@ -1157,7 +1157,7 @@ BuyMenuInitWindows: @ 80E0468
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 1719833a5..4f76d1b69 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -639,7 +639,7 @@ sub_812AA48: @ 812AA48
lsls r1, 2
movs r0, 0
movs r2, 0xE0
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
movs r0, 0
bl PutWindowTilemap
pop {r0}
diff --git a/asm/trade.s b/asm/trade.s
index 061e338cd..911b56aec 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -241,11 +241,11 @@ _08077310:
movs r0, 0
movs r1, 0x14
movs r2, 0xC0
- bl LoadSav2WindowGfx_
+ bl LoadUserWindowBorderGfx_
movs r0, 0x2
movs r1, 0x1
movs r2, 0xE0
- bl LoadSav2WindowGfx
+ bl LoadUserWindowBorderGfx
bl LoadMonIconPalettes
ldr r2, =gUnknown_0203229C
ldr r0, [r2]
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 02:50:48 +0000